diff options
| -rw-r--r-- | Dalos/Dalos.cc | 42 | ||||
| -rw-r--r-- | compile/linux/Makefile | 2 |
2 files changed, 22 insertions, 22 deletions
diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc index 23006c0..b1cef42 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.25 2006-02-09 17:13:31 pixel Exp $ */ +/* $Id: Dalos.cc,v 1.26 2007-07-27 15:20:07 pixel Exp $ */ #include <SDL.h> #include <SDL_thread.h> @@ -63,9 +63,9 @@ Lua * L; CODE_BEGINS -mogltk::widgets::Root * Root; -mogltk::widget * Frame, * MainPanel; -mogltk::widgets::Menu * MainMenu; +mogltk::Widgets::Root * Root; +mogltk::Widget * Frame, * MainPanel; +mogltk::Widgets::Menu * MainMenu; class threaded_Lua : public Lua { public: @@ -238,10 +238,10 @@ class myprinter : public printer_t { SDL_mutex * lock; }; -class frame : public mogltk::widget { +class frame : public mogltk::Widget { public: - frame(mogltk::shape * sh, mogltk::widget * father) : - widget(father, 2, 2, father->GetW() - 4, father->GetH() - 4, 0, "MyFrame", sh) { } + frame(mogltk::Shape * sh, mogltk::Widget * father) : + Widget(father, 2, 2, father->GetW() - 4, father->GetH() - 4, 0, "MyFrame", sh) { } protected: virtual void draw() { } @@ -265,10 +265,10 @@ class frame : public mogltk::widget { } }; -class timer : public mogltk::widget { +class timer : public mogltk::Widget { public: timer() : - widget(Application->Root, 0, 0, 0, 0, 0, "Timer", 0), tick(0) + Widget(Application->Root, 0, 0, 0, 0, 0, "Timer", 0), tick(0) { set_timed_event(100); } protected: virtual bool process_event(int, int, mogltk::event_t event) { @@ -304,17 +304,17 @@ class timer : public mogltk::widget { int tick; }; -class quit : public mogltk::widgets::action { +class quit : public mogltk::Widgets::action { public: - virtual void do_action(mogltk::widget * w) { + virtual void do_action(mogltk::Widget * w) { mogltk::engine::quit(); } } action_quit; -class about : public mogltk::widgets::action { +class about : public mogltk::Widgets::action { public: - virtual void do_action(mogltk::widget * w) { - new mogltk::widgets::MsgBox(0, w->Shaper(), w->Father(), "About...", + virtual void do_action(mogltk::Widget * w) { + new mogltk::Widgets::MsgBox(0, w->Shaper(), w->Father(), "About...", "Dalos version 0.1 - OpenGL version\n" "Copyright (C) 2004-2005 Nicolas \"Pixel\" Noble\n" "\n" @@ -337,25 +337,25 @@ virtual int startup() throw (GeneralException) { new Archive("Dalos.paq"); } - mogltk::widgets::ContextMenu * c; + mogltk::Widgets::ContextMenu * c; #if 1 mogltk::base * gl = new mogltk::glbase(); #else mogltk::base * gl = new mogltk::glbase(800, 600, SDL_FULLSCREEN); #endif - mogltk::shape * sh = new mogltk::glshape(); + mogltk::Shape * sh = new mogltk::glShape(); SDL_EnableKeyRepeat(250, 40); mogltk::engine::setcursorvisible(true); mogltk::engine::setappactive(true); - Root = new mogltk::widgets::Root(sh); + Root = new mogltk::Widgets::Root(sh); MainPanel = Root->InnerPanel(); - 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)); + 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::SmartBoxClose(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); @@ -386,7 +386,7 @@ virtual int startup() throw (GeneralException) { new hexview::hexview_keyevent; new console::console_keyevent; // Should be one of the last -// new mogltk::widgets::InputDialog(0, sh, MainPanel, "Test", "blah blah blah"); +// new mogltk::Widgets::InputDialog(0, sh, MainPanel, "Test", "blah blah blah"); // And launching the main loop Root->mainloop(); diff --git a/compile/linux/Makefile b/compile/linux/Makefile index 54e90b5..2dd67e9 100644 --- a/compile/linux/Makefile +++ b/compile/linux/Makefile @@ -41,7 +41,7 @@ glbase.cc sprite.cc \ glfont.cc texture.cc \ glshape.cc widgets.cc \ glsprite.cc contextmenu.cc \ -inputtext.cc +inputtext.cc LuaGL.cc BALTISOT_SOURCES = \ Image.cc Main.cc \ |