From a06c9ff47887df919b7cf83f1a7fd5b195e67416 Mon Sep 17 00:00:00 2001 From: pixel Date: Wed, 30 Mar 2005 10:32:23 +0000 Subject: Adding LuaConfig class. --- Dalos/Dalos.cc | 7 +- MSVC/Baltisot - generic/Baltisot - generic.vcproj | 1996 +++++++++++---------- cd-tool.cpp | 5 +- compile/linux/Makefile | 3 +- compile/win32/Makefile | 3 +- 5 files changed, 1017 insertions(+), 997 deletions(-) diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc index 4a045ef..fb4c37d 100644 --- a/Dalos/Dalos.cc +++ b/Dalos/Dalos.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Dalos.cc,v 1.15 2005-02-24 11:30:04 pixel Exp $ */ +/* $Id: Dalos.cc,v 1.16 2005-03-30 10:32:23 pixel Exp $ */ #include #include @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -124,6 +125,8 @@ void start_lua() { LuaInput::pushconstruct(L); LuaOutput::pushconstruct(L); LuaBuffer::pushconstruct(L); + + LuaConfigFile::pushstatics(L); CD_PUSHSTATICS(L); Luapsx::pushstatics(L); @@ -316,7 +319,7 @@ virtual int startup() throw (GeneralException) { MainMenu = new mogltk::widgets::Menu(sh, MainPanel); Frame = new frame(sh, new mogltk::widgets::Frame(sh, MainPanel, 0, MainMenu->GetH(), Root->GetW() - 1, Root->GetH() - MainMenu->GetH() - 1)); - mogltk::widget * box = new mogltk::widgets::SmartBox(sh, MainPanel, 50, 50, 500, 400, "Hexview"); + mogltk::widget * box = new mogltk::widgets::SmartBoxClose(sh, MainPanel, 50, 50, 500, 400, "Hexview"); (new hexview(sh, box->InnerPanel()))->bind_handle(new Input(argv[0])); CurrentConsole = new console(sh, Root, 0, 8); diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index eef7467..72edc4f 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -1,992 +1,1004 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cd-tool.cpp b/cd-tool.cpp index 328067e..671503d 100644 --- a/cd-tool.cpp +++ b/cd-tool.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: cd-tool.cpp,v 1.40 2005-03-29 01:47:06 pixel Exp $ */ +/* $Id: cd-tool.cpp,v 1.41 2005-03-30 10:32:24 pixel Exp $ */ #define WIP @@ -28,6 +28,7 @@ #include "Output.h" #include "Buffer.h" #include "BLua.h" +#include "LuaConfigFile.h" #include "cdreader.h" #include "cdutils.h" #include "generic.h" @@ -365,6 +366,8 @@ Lua * start_basic_lua(void) { LuaOutput::pushconstruct(L); LuaBuffer::pushconstruct(L); + LuaConfigFile::pushstatics(L); + CD_PUSHSTATICS(L); Luapsx::pushstatics(L); diff --git a/compile/linux/Makefile b/compile/linux/Makefile index 881e260..4f60ab8 100644 --- a/compile/linux/Makefile +++ b/compile/linux/Makefile @@ -34,7 +34,8 @@ BALTISOT_SOURCES = \ ../../generic/lib/Handle.cc ../../generic/lib/String.cc \ ../../generic/lib/Input.cc ../../generic/lib/fileutils.cc \ ../../generic/lib/LuaHandle.cc ../../generic/lib/generic.cc \ -../../generic/lib/checkargs.c ../../generic/lib/datecalc.c +../../generic/lib/checkargs.c ../../generic/lib/datecalc.c \ +../../generic/lib/LuaConfigFile.cc ZLIB_SOURCES = \ ../../generic/lib/zlib/src/adler32.c ../../generic/lib/zlib/src/inffast.c \ diff --git a/compile/win32/Makefile b/compile/win32/Makefile index 09a4eb1..c4f7bdb 100644 --- a/compile/win32/Makefile +++ b/compile/win32/Makefile @@ -35,7 +35,8 @@ BALTISOT_SOURCES = \ ../../generic/lib/Handle.cc ../../generic/lib/String.cc \ ../../generic/lib/Input.cc ../../generic/lib/fileutils.cc \ ../../generic/lib/LuaHandle.cc ../../generic/lib/generic.cc \ -../../generic/lib/checkargs.c ../../generic/lib/datecalc.c +../../generic/lib/checkargs.c ../../generic/lib/datecalc.c \ +../../generic/lub/LuaConfigFile.cc ZLIB_SOURCES = \ ../../generic/lib/zlib/src/adler32.c ../../generic/lib/zlib/src/inffast.c \ -- cgit v1.2.3