X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f4dc78d358e4f33fbc53d9d4469a735cf0fd19b..9c039d08bfbb59c0abcbc705fb49f9b2cb321edf:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 8081fc3c04..501e625977 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -18,21 +18,26 @@
 #include "wx/postscrp.h"
 #include "wx/intl.h"
 #include "wx/log.h"
+#include "wx/memory.h"
+#include "wx/font.h"
+#include "wx/settings.h"
+#include "wx/resource.h"
 
 #include "unistd.h"
 
-#ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#ifdef wxUSE_GDK_IMLIB
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-wxApp *wxTheApp = NULL;
+wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
+extern wxResourceCache *wxTheResourceCache;
 
 //-----------------------------------------------------------------------------
 // local functions
@@ -47,13 +52,13 @@ extern void wxFlushResources(void);
 void wxExit(void)
 {
   gtk_main_quit();
-};
+}
 
 bool wxYield(void)
 {
   while (gtk_events_pending() > 0) gtk_main_iteration();
   return TRUE;
-};
+}
 
 //-----------------------------------------------------------------------------
 // wxApp
@@ -61,76 +66,149 @@ bool wxYield(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxApp::OnIdle)
+END_EVENT_TABLE()
+
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
-  if (wxTheApp) wxTheApp->OnIdle();
+  if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
   usleep( 10000 );
   return TRUE;
-};
+}
 
 wxApp::wxApp()
 {
   m_idleTag = 0;
-  m_topWindow = NULL;
+  m_topWindow = (wxWindow *) NULL;
   m_exitOnFrameDelete = TRUE;
-};
+  wxTheApp = this;
+}
 
 wxApp::~wxApp(void)
 {
   gtk_idle_remove( m_idleTag );
-};
+}
 
 bool wxApp::OnInit(void)
 {
   return TRUE;
-};
+}
 
 bool wxApp::OnInitGui(void)
-{ 
+{
   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
-  return TRUE; 
-};
+  return TRUE;
+}
+
+int wxApp::OnRun(void)
+{
+  return MainLoop();
+}
 
-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
-};
+bool wxApp::ProcessIdle(void)
+{
+  wxIdleEvent event;
+  event.SetEventObject( this );
+  ProcessEvent( event );
+
+  return event.MoreRequested();
+}
 
-bool wxApp::OnIdle(void)
+void wxApp::OnIdle( wxIdleEvent &event )
 {
+  static bool inOnIdle = FALSE;
+
+  // Avoid recursion (via ProcessEvent default case)
+  if (inOnIdle)
+    return;
+
+  inOnIdle = TRUE;
+
+  // 'Garbage' collection of windows deleted with Close().
   DeletePendingObjects();
-  return FALSE;
-};
+
+  // flush the logged messages if any
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL && pLog->HasPendingMessages() )
+    pLog->Flush();
+
+  // Send OnIdle events to all windows
+  bool needMore = SendIdleEvents();
+
+  if (needMore)
+    event.RequestMore(TRUE);
+
+  inOnIdle = FALSE;
+}
+
+bool wxApp::SendIdleEvents(void)
+{
+    bool needMore = FALSE;
+	wxNode* node = wxTopLevelWindows.First();
+	while (node)
+	{
+		wxWindow* win = (wxWindow*) node->Data();
+		if (SendIdleEvents(win))
+            needMore = TRUE;
+
+		node = node->Next();
+	}
+    return needMore;
+}
+
+bool wxApp::SendIdleEvents( wxWindow* win )
+{
+    bool needMore = FALSE;
+
+	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))
+            needMore = TRUE;
+
+		node = node->Next();
+	}
+    return needMore ;
+}
 
 int wxApp::OnExit(void)
 {
   return 0;
-};
+}
 
 int wxApp::MainLoop(void)
 {
   gtk_main();
   return 0;
-};
+}
 
 void wxApp::ExitMainLoop(void)
 {
   gtk_main_quit();
-};
+}
 
 bool wxApp::Initialized(void)
 {
   return m_initialized;
-};
+}
 
-bool wxApp::Pending(void) 
+bool wxApp::Pending(void)
 {
   return FALSE;
-};
+}
 
-void wxApp::Dispatch(void) 
+void wxApp::Dispatch(void)
 {
-};
+}
 
 void wxApp::DeletePendingObjects(void)
 {
@@ -138,44 +216,53 @@ void wxApp::DeletePendingObjects(void)
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();
-    
+
     delete obj;
 
     if (wxPendingDelete.Member(obj))
       delete node;
 
     node = wxPendingDelete.First();
-  };
-};
+  }
+}
 
 wxWindow *wxApp::GetTopWindow(void)
 {
   if (m_topWindow) return m_topWindow;
   wxNode *node = wxTopLevelWindows.First();
-  if (!node) return NULL;
+  if (!node) return (wxWindow *) NULL;
   return (wxWindow*)node->Data();
-};
+}
 
 void wxApp::SetTopWindow( wxWindow *win )
 {
   m_topWindow = win;
-};
+}
 
 void wxApp::CommonInit(void)
 {
 
 /*
-#if USE_RESOURCES
+#if wxUSE_RESOURCES
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
+  wxSystemSettings::Init();
+  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
+
+  wxTheFontNameDirectory =  new wxFontNameDirectory;
+  wxTheFontNameDirectory->Initialize();
 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
+
+  wxInitializeStockLists();
   wxInitializeStockObjects();
 
+  wxInitializeResourceSystem();
+
   // For PostScript printing
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
   wxInitializePrintSetupData();
   wxThePrintPaperDatabase = new wxPrintPaperDatabase;
   wxThePrintPaperDatabase->CreateDatabase();
@@ -187,17 +274,27 @@ void wxApp::CommonInit(void)
 
   g_globalCursor = new wxCursor;
 */
-
-  wxInitializeStockObjects();
-};
+}
 
 void wxApp::CommonCleanUp(void)
 {
+  wxDELETE(wxTheColourDatabase);
+  wxDELETE(wxThePrintPaperDatabase);
+  wxDELETE(wxThePrintSetupData);
+  wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
-  
+
   wxFlushResources();
-};
-    
+
+  wxDELETE(wxTheResourceCache);
+
+  wxDeleteStockLists();
+
+  wxCleanUpResourceSystem();
+
+  wxSystemSettings::Done();
+}
+
 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;
@@ -212,47 +309,59 @@ int wxEntry( int argc, char *argv[] )
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();
-  
+
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+
+  streambuf* sBuf = new wxDebugStreamBuf;
+  ostream* oStr = new ostream(sBuf) ;
+  wxDebugContext::SetStream(oStr, sBuf);
+
+#endif
+
   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
     {
       printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
       return 0;
-    };
-    
+    }
+
     wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
-    
+
     wxObject *test_app = app_ini();
-    
+
     wxTheApp = (wxApp*) test_app;
-    
-//    wxTheApp = (wxApp*)( app_ini() );
-  };
-  
-  if (!wxTheApp) 
+  }
+
+  if (!wxTheApp)
   {
     printf( "wxWindows error: wxTheApp == NULL\n" );
     return 0;
-  };
+  }
 
-//  printf( "Programmstart.\n" );
-  
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
+
+  char name[200];
+  strcpy( name, argv[0] );
+  strcpy( name, wxFileNameFromPath(name) );
+  wxStripExtension( name );
+  wxTheApp->SetAppName( name );
+  
+  gtk_set_locale();
   
   gtk_init( &argc, &argv );
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   gdk_imlib_init();
-  
+
   gtk_widget_push_visual(gdk_imlib_get_visual());
-  
+
   gtk_widget_push_colormap(gdk_imlib_get_colormap());
-  
-#endif  
-    
+
+#endif
+
   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();
@@ -260,29 +369,50 @@ int wxEntry( int argc, char *argv[] )
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().
-  
+
   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-  
+
   int retValue = 0;
-  
+
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+
+  wxTheApp->DeletePendingObjects();
+
+  wxTheApp->OnExit();
+
+  wxApp::CommonCleanUp();
+
+  wxDELETE(wxTheApp);
+
+  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+  if (oldLog) delete oldLog;
   
-  wxTheApp->DeletePendingObjects();  
+  wxClassInfo::CleanUpClasses();
   
-  wxTheApp->OnExit();
+  delete[] wxBuffer;
   
-  wxApp::CommonCleanUp();
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+  
+  if (wxDebugContext::CountObjectsLeft() > 0)
+  {
+    wxTrace("There were memory leaks.\n");
+    wxDebugContext::Dump();
+    wxDebugContext::PrintStatistics();
+  }
+  wxDebugContext::SetStream(NULL, NULL);
   
+#endif
+
   return retValue;
-};
+}
 
 //-----------------------------------------------------------------------------
 // main()
 //-----------------------------------------------------------------------------
 
-#if defined(AIX) || defined(AIX4) || defined(____HPUX__)
+#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
 
  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h