X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bf77ee556a5418059139305e9edb05bde9b8a1d..8b0d53975d0d1c973b5392e035974cb37975a138:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 21748cb2e9..fee3c423dc 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -35,6 +35,10 @@ #include "wx/module.h" #include "wx/image.h" +#ifdef __WXGPE__ +#include +#endif + #ifdef __WXUNIVERSAL__ #include "wx/univ/theme.h" #include "wx/univ/renderer.h" @@ -399,7 +403,6 @@ END_EVENT_TABLE() wxApp::wxApp() { - m_initialized = FALSE; #ifdef __WXDEBUG__ m_isInAssert = FALSE; #endif // __WXDEBUG__ @@ -538,42 +541,6 @@ GdkVisual *wxApp::GetGdkVisual() return visual; } -int wxApp::MainLoop() -{ - gtk_main(); - return 0; -} - -void wxApp::Exit() -{ - // VZ: no idea why is it different from ExitMainLoop() but this is what - // wxExit() used to do - gtk_main_quit(); -} - -void wxApp::ExitMainLoop() -{ - if (gtk_main_level() > 0) - gtk_main_quit(); -} - -bool wxApp::Initialized() -{ - return m_initialized; -} - -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} - -bool wxApp::Dispatch() -{ - gtk_main_iteration(); - - return true; -} - bool wxApp::Initialize(int& argc, wxChar **argv) { #if wxUSE_THREADS @@ -619,7 +586,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv) argvGTK[argc] = NULL; int argcGTK = argc; + +#ifdef __WXGPE__ + gpe_application_init( &argcGTK, &argvGTK ); +#else gtk_init( &argcGTK, &argvGTK ); +#endif if ( argcGTK != argc ) {