X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a8af592a08f0a23b18be6e92a8bcdcf4e16e79..07fa75bc31fd49da3e4bd4a8bf056a96493bf26b:/src/gtk/app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 584837f9c7..e3bb20d00d 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -154,7 +154,7 @@ bool wxYield()
     // We need to temporarily remove idle callbacks or the loop will
     // never finish.
     gtk_idle_remove( wxTheApp->m_idleTag );
-    
+
     while (gtk_events_pending())
         gtk_main_iteration();
 
@@ -219,7 +219,7 @@ bool wxApp::OnInitGui()
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.
-	   NOTE: this doesn't really seem to work this way... */
+           NOTE: this doesn't really seem to work this way... */
 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
@@ -246,13 +246,13 @@ bool wxApp::OnInitGui()
 
      for (int r = 0; r < 32; r++)
      {
-	for (int g = 0; g < 32; g++)
-	{
-	    for (int b = 0; b < 32; b++)
-	    {
-		int rr = (r << 3) | (r >> 2);
-		int gg = (g << 3) | (g >> 2);
-		int bb = (b << 3) | (b >> 2);
+        for (int g = 0; g < 32; g++)
+        {
+            for (int b = 0; b < 32; b++)
+            {
+                int rr = (r << 3) | (r >> 2);
+                int gg = (g << 3) | (g >> 2);
+                int bb = (b << 3) | (b >> 2);
 
                 GdkColor *colors = cmap->colors;
                 int max = 3 * (65536);
@@ -267,9 +267,9 @@ bool wxApp::OnInitGui()
                     if (sum < max) { index = i; max = sum; }
                 }
 
-		m_colorCube[ (r*1024) + (g*32) + b ] = index;
-	    }
-	}
+                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+            }
+        }
     }
 
 
@@ -378,11 +378,12 @@ bool wxApp::Initialized()
 
 bool wxApp::Pending()
 {
-    return FALSE;
+    return gtk_events_pending();
 }
 
 void wxApp::Dispatch()
 {
+    gtk_main_iteration();
 }
 
 #if wxUSE_THREADS
@@ -402,7 +403,7 @@ void wxApp::ProcessPendingEvents()
         node = wxPendingEvents->First();
     }
 }
-#endif
+#endif // wxUSE_THREADS
 
 void wxApp::DeletePendingObjects()
 {
@@ -437,7 +438,7 @@ void wxApp::SetTopWindow( wxWindow *win )
 
 bool wxApp::Initialize()
 {
-    wxBuffer = new char[BUFSIZ + 512];
+    wxBuffer = new wxChar[BUFSIZ + 512];
 
     wxClassInfo::InitializeClasses();
 
@@ -527,11 +528,11 @@ void wxApp::CleanUp()
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug(_T("There were memory leaks.\n"));
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
-#endif
+#endif // Debug
 
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
@@ -562,7 +563,7 @@ int wxEntry( int argc, char *argv[] )
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
-                     "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+                     _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 
@@ -571,52 +572,54 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp = (wxApp*) test_app;
     }
 
-    wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" );
+    wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
 
     wxTheApp->argc = argc;
     wxTheApp->argv = argv;
 
-    char name[200];
-    strcpy( name, argv[0] );
-    strcpy( name, wxFileNameFromPath(name) );
+    wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 
-    if (!wxTheApp->OnInitGui())
-        return 0;
-
-    /* Here frames insert themselves automatically
-     * into wxTopLevelWindows by getting created
-     * in OnInit(). */
+    int retValue = 0;
 
-    if (!wxTheApp->OnInit())
-        return 0;
+    if ( !wxTheApp->OnInitGui() )
+        retValue = -1;
 
-    wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
+    if ( retValue == 0 )
+    {
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;
+    }
 
-    int retValue = 0;
+    if ( retValue == 0 )
+    {
+        wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
 
-    if (wxTheApp->Initialized())
-        retValue = wxTheApp->OnRun();
+        if (wxTheApp->Initialized())
+            retValue = wxTheApp->OnRun();
 
-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if (topWindow)
-    {
-        // Forcibly delete the window.
-        if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-            topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+        wxWindow *topWindow = wxTheApp->GetTopWindow();
+        if (topWindow)
         {
-            topWindow->Close( TRUE );
-            wxTheApp->DeletePendingObjects();
+            // Forcibly delete the window.
+            if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+            {
+                topWindow->Close( TRUE );
+                wxTheApp->DeletePendingObjects();
+            }
+            else
+            {
+                delete topWindow;
+                wxTheApp->SetTopWindow( (wxWindow*) NULL );
+            }
         }
-        else
-        {
-            delete topWindow;
-            wxTheApp->SetTopWindow( (wxWindow*) NULL );
-        }
-    }
 
-    wxTheApp->OnExit();
+        wxTheApp->OnExit();
+    }
 
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();