no message

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 631a12eff8d5308bb38e787e03e4fa7393573b95..5e1c0e5755b0f8819f24ccd18e63ebe754c5226c 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__
@@ -19,11 +19,21 @@
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
+#if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
+#endif
 #include "wx/module.h"
-
+#include "wx/image.h"
+#if wxUSE_THREADS
+#include "wx/thread.h"
+#endif
 #include "unistd.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -84,12 +94,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,
@@ -136,7 +146,13 @@ END_EVENT_TABLE()
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
-    usleep( 10000 );
+#if wxUSE_THREADS
+    wxMutexGuiLeave();
+#endif
+    usleep(10000);
+#if wxUSE_THREADS
+    wxMutexGuiEnter();
+#endif
     return TRUE;
 }
 
@@ -182,21 +198,21 @@ void wxApp::OnIdle( wxIdleEvent &event )
 {
     static bool inOnIdle = FALSE;
 
-    // Avoid recursion (via ProcessEvent default case)
+    /* Avoid recursion (via ProcessEvent default case) */
     if (inOnIdle)
         return;
 
     inOnIdle = TRUE;
 
-    // 'Garbage' collection of windows deleted with Close().
+    /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if (pLog != NULL && pLog->HasPendingMessages())
-        pLog->Flush();
+    /* flush the logged messages if any */
+    wxLog *log = wxLog::GetActiveTarget();
+    if (log != NULL && log->HasPendingMessages())
+        log->Flush();
 
-    // Send OnIdle events to all windows
+    /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();
 
     if (needMore)
@@ -208,12 +224,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 +240,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 ;
 }
 
@@ -311,8 +327,7 @@ void wxApp::CommonInit(void)
 #endif
 */
   wxSystemSettings::Init();
-  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
-
+  
   wxTheFontNameDirectory =  new wxFontNameDirectory;
   wxTheFontNameDirectory->Initialize();
 
@@ -322,10 +337,14 @@ void wxApp::CommonInit(void)
   wxInitializeStockLists();
   wxInitializeStockObjects();
 
+#if wxUSE_WX_RESOURCES
+  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
+  
   wxInitializeResourceSystem();
+#endif
 
   wxImage::InitStandardHandlers();
-  
+
 //  g_globalCursor = new wxCursor;
 }
 
@@ -335,14 +354,16 @@ void wxApp::CommonCleanUp(void)
     wxDELETE(wxTheFontNameDirectory);
     wxDeleteStockObjects();
 
+#if wxUSE_WX_RESOURCES
     wxFlushResources();
 
     wxDELETE(wxTheResourceCache);
+    
+    wxCleanUpResourceSystem();
+#endif
 
     wxDeleteStockLists();
 
-    wxCleanUpResourceSystem();
-  
     wxImage::CleanUpHandlers();
 
     wxSystemSettings::Done();
@@ -363,14 +384,6 @@ int wxEntry( int argc, char *argv[] )
 
     wxClassInfo::InitializeClasses();
 
-  /* Debug stream no longer used
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-
-  streambuf* sBuf = new wxDebugStreamBuf;
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
-#endif
-*/
 
     if (!wxTheApp)
     {
@@ -401,9 +414,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 +428,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,26 +460,25 @@ 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");
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
-//  wxDebugContext::SetStream(NULL, NULL);
-  
+
 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget( NULL );
@@ -476,17 +488,4 @@ 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
-