Changeset 131
- Timestamp:
- 08/26/10 15:45:04 (18 months ago)
- Location:
- cafu/branches/cafu_to_wx/Ca3DE
- Files:
-
- 3 modified
-
AppCafu.cpp (modified) (5 diffs)
-
AppCafu.hpp (modified) (2 diffs)
-
MainCanvas.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
cafu/branches/cafu_to_wx/Ca3DE/AppCafu.cpp
r130 r131 81 81 82 82 83 IMPLEMENT_APP(AppCafu )84 85 86 AppCafu ::AppCafu()83 IMPLEMENT_APP(AppCafuT) 84 85 86 AppCafuT::AppCafuT() 87 87 : wxApp(), 88 88 m_IsCustomVideoMode(false), … … 106 106 107 107 108 bool AppCafu ::OnInit()108 bool AppCafuT::OnInit() 109 109 { 110 110 const wxString UserDataDir=wxStandardPaths::Get().GetUserDataDir(); … … 229 229 230 230 231 int AppCafu ::OnExit()231 int AppCafuT::OnExit() 232 232 { 233 233 if (m_IsCustomVideoMode) … … 270 270 271 271 272 void AppCafu ::OnInitCmdLine(wxCmdLineParser& Parser)272 void AppCafuT::OnInitCmdLine(wxCmdLineParser& Parser) 273 273 { 274 274 Parser.AddOption("con", "", "Runs the given commands in the console. -con \"x=3;\" is equivalent to appending x=3; to the end of the config.lua file.", wxCMD_LINE_VAL_STRING); … … 295 295 296 296 297 bool AppCafu ::OnCmdLineParsed(wxCmdLineParser& Parser)297 bool AppCafuT::OnCmdLineParsed(wxCmdLineParser& Parser) 298 298 { 299 299 long int i=0; -
cafu/branches/cafu_to_wx/Ca3DE/AppCafu.hpp
r130 r131 43 43 44 44 /// This class represents the Cafu Engine application. 45 class AppCafu : public wxApp45 class AppCafuT : public wxApp 46 46 { 47 47 public: 48 48 49 AppCafu ();49 AppCafuT(); 50 50 51 51 /// Returns whether we successfully set a custom video mode (screen resolution) during initialization. … … 74 74 75 75 76 /// This macro provides the wxGetApp() function , which returns a reference to AppCafu, for use in other files.77 DECLARE_APP(AppCafu )76 /// This macro provides the wxGetApp() function which returns a reference to our AppCafuT instance. 77 DECLARE_APP(AppCafuT) 78 78 79 79 #endif -
cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp
r130 r131 379 379 380 380 // Initialize the GUI systems GUI managager. 381 // - This has to be done *after* all materials are loaded (AppCafu ::OnInit()) and after the MatSys::Renderer381 // - This has to be done *after* all materials are loaded (AppCafuT::OnInit()) and after the MatSys::Renderer 382 382 // has been initialized, so that the GuiMan finds its default material and can register it for rendering. 383 383 // - It has to be done *before* the game is initialized, because even the server needs access to it
