diff options
| author | pixel <pixel> | 2005-12-02 16:21:59 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2005-12-02 16:21:59 +0000 |
| commit | 1df63b6250d88b82ff7756f8c1a4b11f8d686897 (patch) | |
| tree | c3aba367251367f15febb8bf83cc7d3dc5817601 | |
| parent | ce887d66a761c7b84ba8011d8bc47e3c83bb5488 (diff) | |
Added cascade stuff for buttons, and cleaned source a bit.
| -rw-r--r-- | Dalos/Dalos.cc | 10 | ||||
| -rw-r--r-- | MSVC/mogltk/mogltk.vcproj | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc index c08052d..4936caf 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.20 2005-12-02 11:22:51 pixel Exp $ */ +/* $Id: Dalos.cc,v 1.21 2005-12-02 16:21:59 pixel Exp $ */ #include <SDL.h> #include <SDL_thread.h> @@ -266,7 +266,9 @@ class timer : public mogltk::widget { Application->MainMenu->SetCaption(0, "I"); break; } - Application->MainMenu->SetCaption(3, String("FPS: ") + mogltk::engine::FPS()); + String fps; + fps.set("FPS: %6.2f", mogltk::engine::FPS()); + Application->MainMenu->SetCaption(3, fps); return true; } return false; @@ -330,7 +332,7 @@ virtual int startup() throw (GeneralException) { console::create_console_thread(); CurrentConsole->move(0, Root->GetH() - CurrentConsole->GetH()); CurrentConsole->add_line("Dalos v0.1 - LUA console - Press ESC to show/hide it."); - CurrentConsole->SetVisible(true); +// CurrentConsole->SetVisible(true); printer = new myprinter(); locker = new threaded_locker(); @@ -354,6 +356,8 @@ 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"); + // And launching the main loop Root->mainloop(); diff --git a/MSVC/mogltk/mogltk.vcproj b/MSVC/mogltk/mogltk.vcproj index f150858..29dab9a 100644 --- a/MSVC/mogltk/mogltk.vcproj +++ b/MSVC/mogltk/mogltk.vcproj @@ -239,6 +239,10 @@ Name="widgets" > <File + RelativePath="..\..\mogltk\lib\contextmenu.cc" + > + </File> + <File RelativePath="..\..\mogltk\lib\glwidgets.cc" > </File> @@ -247,6 +251,10 @@ > </File> <File + RelativePath="..\..\mogltk\lib\inputtext.cc" + > + </File> + <File RelativePath="..\..\mogltk\lib\widgets.cc" > </File> |