Corrected wxFileSystemHandler::GetRightLocation for the case

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index e58a9c8e97780ce90199ea12be0422751d8d53e5..fee3c423dcc5537b82b66953f1fb97b46db36472 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -35,6 +35,10 @@
 #include "wx/module.h"
 #include "wx/image.h"
 
 #include "wx/module.h"
 #include "wx/image.h"
 

+#ifdef __WXGPE__
+#include <gpe/init.h>
+#endif
+

 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
     #include "wx/univ/renderer.h"
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
     #include "wx/univ/renderer.h"


@@ -399,7 +403,6 @@ END_EVENT_TABLE()
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_initialized = FALSE;

 #ifdef __WXDEBUG__
     m_isInAssert = FALSE;
 #endif // __WXDEBUG__
 #ifdef __WXDEBUG__
     m_isInAssert = FALSE;
 #endif // __WXDEBUG__


@@ -538,40 +541,6 @@ GdkVisual *wxApp::GetGdkVisual()
     return visual;
 }
 
     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);
-}
-
-void wxApp::Dispatch()
-{
-    gtk_main_iteration();
-}
-

 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
 #if wxUSE_THREADS
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
 #if wxUSE_THREADS


@@ -617,7 +586,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;

+    
+#ifdef __WXGPE__
+    gpe_application_init( &argcGTK, &argvGTK );
+#else

     gtk_init( &argcGTK, &argvGTK );
     gtk_init( &argcGTK, &argvGTK );

+#endif

 
     if ( argcGTK != argc )
     {
 
     if ( argcGTK != argc )
     {