* Fixes

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 631a12eff8d5308bb38e787e03e4fa7393573b95..6337f7dc21fab18adb2b75e916a56c96229f78c1 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -21,6 +21,7 @@
 #include "wx/settings.h"
 #include "wx/resource.h"
 #include "wx/module.h"
+#include "wx/image.h"
 
 #include "unistd.h"
 
@@ -84,12 +85,12 @@ unsigned char g_palette[64*3] =
   0x75, 0x93, 0x4f,
   0x91, 0xae, 0x64,
   0xad, 0xc8, 0x7a,
-  0xf0, 0xa8, 0xef, 
+  0xf0, 0xa8, 0xef,
   0xd0, 0x88, 0xd0,
   0xaf, 0x66, 0xaf,
   0x8e, 0x44, 0x8e,
   0x6d, 0x22, 0x6d,
-  0x4b, 0x0,  0x4b, 
+  0x4b, 0x0,  0x4b,
   0xff, 0xc0, 0xbc,
   0xff, 0x93, 0x91,
   0xff, 0x66, 0x67,
@@ -208,12 +209,12 @@ void wxApp::OnIdle( wxIdleEvent &event )
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;
-    
+
     wxNode* node = wxTopLevelWindows.First();
     while (node)
     {
-       wxWindow* win = (wxWindow*) node->Data();
-       if (SendIdleEvents(win))
+  wxWindow* win = (wxWindow*) node->Data();
+  if (SendIdleEvents(win))
             needMore = TRUE;
         node = node->Next();
     }
@@ -224,22 +225,22 @@ bool wxApp::SendIdleEvents( wxWindow* win )
 {
     bool needMore = FALSE;
 
-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+    wxIdleEvent event;
+    event.SetEventObject(win);
+    win->ProcessEvent(event);
 
     if (event.MoreRequested())
         needMore = TRUE;
 
-       wxNode* node = win->GetChildren()->First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
+    wxNode* node = win->GetChildren().First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        if (SendIdleEvents(win))
             needMore = TRUE;
 
-               node = node->Next();
-       }
+        node = node->Next();
+    }
     return needMore ;
 }
 
@@ -325,7 +326,7 @@ void wxApp::CommonInit(void)
   wxInitializeResourceSystem();
 
   wxImage::InitStandardHandlers();
-  
+
 //  g_globalCursor = new wxCursor;
 }
 
@@ -342,7 +343,7 @@ void wxApp::CommonCleanUp(void)
     wxDeleteStockLists();
 
     wxCleanUpResourceSystem();
-  
+
     wxImage::CleanUpHandlers();
 
     wxSystemSettings::Done();
@@ -401,9 +402,9 @@ int wxEntry( int argc, char *argv[] )
     strcpy( name, wxFileNameFromPath(name) );
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
-  
+
     gtk_set_locale();
-  
+
     gtk_init( &argc, &argv );
 
     GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
@@ -415,19 +416,19 @@ int wxEntry( int argc, char *argv[] )
         col.green  = g_palette[i*3 + 1] << 8;
         col.blue   = g_palette[i*3 + 2] << 8;
         col.pixel  = 0;
-    
+
         gdk_color_alloc( cmap, &col );
     }
-  
+
     gtk_widget_push_colormap( cmap );
-  
+
     gtk_widget_set_default_colormap( cmap );
 
     wxApp::CommonInit();
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
-    
+
     wxTheApp->OnInitGui();
 
     // Here frames insert themselves automatically
@@ -447,18 +448,18 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->OnExit();
 
     wxModule::CleanUpModules();
-  
+
     wxApp::CommonCleanUp();
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     wxClassInfo::CleanUpClasses();
-  
+
     delete[] wxBuffer;
-  
+
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-  
+
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
         wxLogDebug("There were memory leaks.\n");
@@ -466,7 +467,7 @@ int wxEntry( int argc, char *argv[] )
         wxDebugContext::PrintStatistics();
     }
 //  wxDebugContext::SetStream(NULL, NULL);
-  
+
 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget( NULL );
@@ -476,17 +477,7 @@ int wxEntry( int argc, char *argv[] )
 }
 
 //-----------------------------------------------------------------------------
-// main()
-//-----------------------------------------------------------------------------
-
-#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
 
- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
 
-#else
-
-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
-
-#endif