fix PangoFontMetrics leak in GetCharHeight() (bug 1691180)

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 9cfd6f22531a2c43a37cbef946dbd0a42a588713..fa47355e8fae1c4257dfa1bdbc17c9a1b60a1dee 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -1,367 +1,565 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/gtk/app.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "app.h"
+#ifdef __VMS
+// vms_jackets.h should for proper working be included before anything else
+# include <vms_jackets.h>
+#undef ConnectionNumber

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/postscrp.h"
-#include "wx/intl.h"
-#include "wx/log.h"

 
 

-#include "unistd.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/memory.h"
+    #include "wx/font.h"
+#endif
+
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+    #include <gpe/init.h>
+#endif
+
+#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
+
+#include <gdk/gdkx.h>
+
+//-----------------------------------------------------------------------------
+// link GnomeVFS
+//-----------------------------------------------------------------------------

 
 

-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_vfs)

 #endif
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 #endif
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-wxApp *wxTheApp = NULL;
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+bool   g_mainThreadLocked = false;

 
 

-extern wxList wxPendingDelete;
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// local functions
+// idle system

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern void wxFlushResources(void);
+void wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+static wxMutex gs_idleTagsMutex;
+#endif

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// global functions
+// wxYield

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void wxExit(void)
-{
-  gtk_main_quit();
-};
+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = false;

 
 

-bool wxYield(void)
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-  while (gtk_events_pending() > 0) gtk_main_iteration();
-  return TRUE;
-};
+    if ( wxIsInsideYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
+
+        return false;
+    }
+
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return true;
+    }
+#endif // wxUSE_THREADS
+
+    wxIsInsideYield = true;
+
+    // We need to remove idle callbacks or the loop will
+    // never finish.
+    SuspendIdleCallback();
+
+#if wxUSE_LOG
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+#endif
+
+    while (gtk_events_pending())
+        gtk_main_iteration();
+
+    // It's necessary to call ProcessIdle() to update the frames sizes which
+    // might have been changed (it also will update other things set from
+    // OnUpdateUI() which is a nice (and desired) side effect). But we
+    // call ProcessIdle() only once since this is not meant for longish
+    // background jobs (controlled by wxIdleEvent::RequestMore() and the
+    // return value of Processidle().
+    ProcessIdle();
+
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif
+
+    wxIsInsideYield = false;
+
+    return true;
+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxApp
+// wxWakeUpIdle

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+// RR/KH: No wxMutexGui calls are needed here according to the GTK faq,
+// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent.

 
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+void wxApp::WakeUpIdle()
+{
+    wxapp_install_idle_handler();
+}
+
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------

 
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+// the callback functions must be extern "C" to comply with GTK+ declarations
+extern "C"

 {
 {

-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {};
-  usleep( 10000 );
-  return TRUE;
-};

 
 

-wxApp::wxApp()
+// One-shot emission hook for "event" signal, to install idle handler.
+// This will be called when the "event" signal is issued on any GtkWidget object.
+static gboolean
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)

 {
 {

-  m_idleTag = 0;
-  m_topWindow = NULL;
-  m_exitOnFrameDelete = TRUE;
-};
+    wxapp_install_idle_handler();
+    // remove hook
+    return false;
+}

 
 

-wxApp::~wxApp(void)
+// add emission hook for "event" signal, to re-install idle handler when needed
+static inline void wxAddEmissionHook()

 {
 {

-  gtk_idle_remove( m_idleTag );
-};
+    GType widgetType = GTK_TYPE_WIDGET;
+    // if GtkWidget type is loaded
+    if (g_type_class_peek(widgetType) != NULL)
+    {
+        guint sig_id = g_signal_lookup("event", widgetType);
+        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+    }
+}

 
 

-bool wxApp::OnInit(void)
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )

 {
 {

-  return TRUE;
-};
+    // this does not look possible, but just in case...
+    if (!wxTheApp)
+        return false;
+
+    bool moreIdles = false;
+
+#ifdef __WXDEBUG__
+    // don't generate the idle events while the assert modal dialog is shown,
+    // this matches the behavior of wxMSW
+    if (!wxTheApp->IsInAssert())
+#endif // __WXDEBUG__
+    {
+        guint idleID_save;
+        {
+            // Allow another idle source to be added while this one is busy.
+            // Needed if an idle event handler runs a new event loop,
+            // for example by showing a dialog.
+#if wxUSE_THREADS
+            wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+            idleID_save = wxTheApp->m_idleTag;
+            wxTheApp->m_idleTag = 0;
+            g_isIdle = true;
+            wxAddEmissionHook();
+        }
+
+        // When getting called from GDK's time-out handler
+        // we are no longer within GDK's grab on the GUI
+        // thread so we must lock it here ourselves.
+        gdk_threads_enter();
+
+        // Send idle event to all who request them as long as
+        // no events have popped up in the event queue.
+        do {
+            moreIdles = wxTheApp->ProcessIdle();
+        } while (moreIdles && gtk_events_pending() == 0);
+
+        // Release lock again
+        gdk_threads_leave();
+
+        {
+            // If another idle source was added, remove it
+#if wxUSE_THREADS
+            wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+            if (wxTheApp->m_idleTag != 0)
+                g_source_remove(wxTheApp->m_idleTag);
+            wxTheApp->m_idleTag = idleID_save;
+            g_isIdle = false;
+        }
+    }
+
+    if (!moreIdles)
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        // Indicate that we are now in idle mode and event handlers
+        // will have to reinstall the idle handler again.
+        g_isIdle = true;
+        wxTheApp->m_idleTag = 0;

 
 

-bool wxApp::OnInitGui(void)
-{ 
-  m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
-  return TRUE; 
-};
+        wxAddEmissionHook();
+    }

 
 

-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
-};
+    // Return FALSE if no more idle events are to be sent
+    return moreIdles;
+}
+} // extern "C"

 
 

-bool wxApp::ProcessIdle(void)
-{
-  wxIdleEvent event;
-  event.SetEventObject( this );
-  ProcessEvent( event );
-  
-  return event.MoreRequested();
-};
-
-void wxApp::OnIdle( wxIdleEvent &event )
-{
-  static bool inOnIdle = FALSE;
+#if wxUSE_THREADS

 
 

-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+static GPollFunc wxgs_poll_func;

 
 

-  inOnIdle = TRUE;
+extern "C" {
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
+{
+    gdk_threads_enter();

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    wxMutexGuiLeave();
+    g_mainThreadLocked = true;

 
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    gint res = (*wxgs_poll_func)(ufds, nfds, timeout);

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+    wxMutexGuiEnter();
+    g_mainThreadLocked = false;

 
 

-  if (needMore)
-    event.RequestMore(TRUE);
+    gdk_threads_leave();

 
 

-  inOnIdle = FALSE;
-};
+    return res;
+}
+}

 
 

-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 )
+#endif // wxUSE_THREADS
+
+void wxapp_install_idle_handler()

 {
 {

-    bool needMore = FALSE;
+    if (wxTheApp == NULL)
+        return;

 
 

-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+    // Don't install the handler if it's already installed. This test *MUST*
+    // be done when gs_idleTagsMutex is locked!
+    if (!g_isIdle)
+        return;

 
 

-       wxNode* node = win->GetChildren()->First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
+    // GD: this assert is raised when using the thread sample (which works)
+    //     so the test is probably not so easy. Can widget callbacks be
+    //     triggered from child threads and, if so, for which widgets?
+    // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") );

 
 

-               node = node->Next();
-       }
-    return needMore ;
-};
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );

 
 

-int wxApp::OnExit(void)
-{
-  return 0;
-};
+    g_isIdle = false;

 
 

-int wxApp::MainLoop(void)
-{
-  gtk_main();
-  return 0;
-};
+    // This routine gets called by all event handlers
+    // indicating that the idle is over. It may also
+    // get called from other thread for sending events
+    // to the main thread (and processing these in
+    // idle time). Very low priority.
+    wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
+}

 
 

-void wxApp::ExitMainLoop(void)
-{
-  gtk_main_quit();
-};
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------

 
 

-bool wxApp::Initialized(void)
+GtkWidget* wxGetRootWindow()

 {
 {

-  return m_initialized;
-};
+    if (gs_RootWindow == NULL)
+    {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;
+}
+
+//-----------------------------------------------------------------------------
+// wxApp
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxAppBase::OnIdle)
+END_EVENT_TABLE()

 
 

-bool wxApp::Pending(void) 
+wxApp::wxApp()

 {
 {

-  return FALSE;
-};
+#ifdef __WXDEBUG__
+    m_isInAssert = false;
+#endif // __WXDEBUG__
+
+    m_idleTag = 0;
+    g_isIdle = true;
+    wxapp_install_idle_handler();
+
+    // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
+    m_glVisualInfo = (void *) NULL;
+    m_glFBCInfo = (void *) NULL;
+}

 
 

-void wxApp::Dispatch(void) 
+wxApp::~wxApp()

 {
 {

-};
+    if (m_idleTag)
+        g_source_remove( m_idleTag );
+}

 
 

-void wxApp::DeletePendingObjects(void)
+bool wxApp::OnInitGui()

 {
 {

-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    
-    delete obj;
+    if ( !wxAppBase::OnInitGui() )
+        return false;

 
 

-    if (wxPendingDelete.Member(obj))
-      delete node;
+    // if this is a wxGLApp (derived from wxApp), and we've already
+    // chosen a specific visual, then derive the GdkVisual from that
+    if (m_glVisualInfo != NULL)
+    {
+        GdkVisual* vis = gtk_widget_get_default_visual();

 
 

-    node = wxPendingDelete.First();
-  };
-};
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+    }
+    else
+    {
+        // On some machines, the default visual is just 256 colours, so
+        // we make sure we get the best. This can sometimes be wasteful.
+        if (m_useBestVisual)
+        {
+            if (m_forceTrueColour)
+            {
+                GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR );
+                if (!visual)
+                {
+                    wxLogError(wxT("Unable to initialize TrueColor visual."));
+                    return false;
+                }
+                GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+                gtk_widget_set_default_colormap( colormap );
+            }
+            else
+            {
+                if (gdk_visual_get_best() != gdk_visual_get_system())
+                {
+                    GdkVisual* visual = gdk_visual_get_best();
+                    GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+                    gtk_widget_set_default_colormap( colormap );
+                }
+            }
+        }
+    }
+
+    return true;
+}

 
 

-wxWindow *wxApp::GetTopWindow(void)
+GdkVisual *wxApp::GetGdkVisual()

 {
 {

-  if (m_topWindow) return m_topWindow;
-  wxNode *node = wxTopLevelWindows.First();
-  if (!node) return NULL;
-  return (wxWindow*)node->Data();
-};
+    GdkVisual *visual = NULL;

 
 

-void wxApp::SetTopWindow( wxWindow *win )
-{
-  m_topWindow = win;
-};
+    if (m_glVisualInfo)
+        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+    else
+        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
+
+    wxASSERT( visual );
+
+    return visual;
+}

 
 

-void wxApp::CommonInit(void)
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;
+
+#if wxUSE_THREADS
+    if (!g_thread_supported())
+        g_thread_init(NULL);
+
+    wxgs_poll_func = g_main_context_get_poll_func(NULL);
+    g_main_context_set_poll_func(NULL, wxapp_poll_func);
+#endif // wxUSE_THREADS
+
+    // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
+    // gtk+ 2.0 supports Unicode through UTF-8 strings
+    wxConvCurrent = &wxConvUTF8;
+#else // !wxUSE_WCHAR_T
+    if (!wxOKlibc())
+        wxConvCurrent = (wxMBConv*) NULL;
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+
+    // decide which conversion to use for the file names
+
+    // (1) this variable exists for the sole purpose of specifying the encoding
+    //     of the filenames for GTK+ programs, so use it if it is set
+    wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
+    encName = encName.BeforeFirst(_T(','));
+    if (encName.CmpNoCase(_T("@locale")) == 0)
+        encName.clear();
+    encName.MakeUpper();
+#if wxUSE_INTL
+    if (encName.empty())
+    {
+        // (2) if a non default locale is set, assume that the user wants his
+        //     filenames in this locale too
+        encName = wxLocale::GetSystemEncodingName().Upper();
+        // (3) finally use UTF-8 by default
+        if (encName.empty() || encName == _T("US-ASCII"))
+            encName = _T("UTF-8");
+        wxSetEnv(_T("G_FILENAME_ENCODING"), encName);
+    }
+#else
+    if (encName.empty())
+        encName = _T("UTF-8");

 
 

-/*
-#if USE_RESOURCES
-  (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
-*/
+    // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported
+    // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "")
+    // from gtk_init_check() as it does by default
+    gtk_disable_setlocale();

 
 

-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
-  wxInitializeStockObjects();
+#endif // wxUSE_INTL
+    static wxConvBrokenFileNames fileconv(encName);
+    wxConvFileName = &fileconv;

 
 

-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
+
+    bool init_result;
+
+#if wxUSE_UNICODE
+    // gtk_init() wants UTF-8, not wchar_t, so convert
+    int i;
+    char **argvGTK = new char *[argc + 1];
+    for ( i = 0; i < argc; i++ )
+    {
+        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
+    }
+
+    argvGTK[argc] = NULL;
+
+    int argcGTK = argc;
+
+#ifdef __WXGPE__
+    init_result = true;  // is there a _check() version of this?
+    gpe_application_init( &argcGTK, &argvGTK );
+#else
+    init_result = gtk_init_check( &argcGTK, &argvGTK );

 #endif
 
 #endif
 

+    if ( argcGTK != argc )
+    {
+        // we have to drop the parameters which were consumed by GTK+
+        for ( i = 0; i < argcGTK; i++ )
+        {
+            while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
+            {
+                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
+            }
+        }
+
+        argc = argcGTK;
+    }
+    //else: gtk_init() didn't modify our parameters
+
+    // free our copy
+    for ( i = 0; i < argcGTK; i++ )
+    {
+        free(argvGTK[i]);
+    }

 
 

-/*
-  wxBitmap::InitStandardHandlers();
+    delete [] argvGTK;
+#else // !wxUSE_UNICODE
+    // gtk_init() shouldn't actually change argv itself (just its contents) so
+    // it's ok to pass pointer to it
+    init_result = gtk_init_check( &argc, &argv );
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

 
 

-  g_globalCursor = new wxCursor;
-*/
+    if (!init_result) {
+        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+        return false;
+    }

 
 

-  wxInitializeStockObjects();
-};
+    // we can not enter threads before gtk_init is done
+    gdk_threads_enter();

 
 

-void wxApp::CommonCleanUp(void)
-{
-  wxDeleteStockObjects();
-  
-  wxFlushResources();
-};
-    
-wxLog *wxApp::CreateLogTarget()
-{
-  return new wxLogGui;
-}
+    wxSetDetectableAutoRepeat( true );

 
 

-//-----------------------------------------------------------------------------
-// wxEntry
-//-----------------------------------------------------------------------------
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-int wxEntry( int argc, char *argv[] )
+    return true;
+}
+
+void wxApp::CleanUp()

 {
 {

-  wxBuffer = new char[BUFSIZ + 512];
+    gdk_threads_leave();

 
 

-  wxClassInfo::InitializeClasses();
-  
-  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) 
-  {
-    printf( "wxWindows error: wxTheApp == NULL\n" );
-    return 0;
-  };
-
-//  printf( "Programmstart.\n" );
-  
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
-  
-  gtk_init( &argc, &argv );
-
-#ifdef USE_GDK_IMLIB
-
-  gdk_imlib_init();
-  
-  gtk_widget_push_visual(gdk_imlib_get_visual());
-  
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
-  
-#endif  
-    
-  wxApp::CommonInit();
-
-  wxTheApp->OnInitGui();
-
-  // 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();
-  
-  return retValue;
-};
+    wxAppBase::CleanUp();
+}

 
 

-//-----------------------------------------------------------------------------
-// main()
-//-----------------------------------------------------------------------------
+#ifdef __WXDEBUG__

 
 

-#if defined(AIX) || defined(AIX4) || defined(____HPUX__)
+void wxApp::OnAssertFailure(const wxChar *file,
+                            int line,
+                            const wxChar* func,
+                            const wxChar* cond,
+                            const wxChar *msg)
+{

 
 

- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
+    // block wx idle events while assert dialog is showing
+    m_isInAssert = true;

 
 

-#else
+    wxAppBase::OnAssertFailure(file, line, func, cond, msg);

 
 

-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
-
-#endif
+    m_isInAssert = false;
+}

 
 

+#endif // __WXDEBUG__

 
 

+void wxApp::SuspendIdleCallback()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+    if (m_idleTag != 0)
+    {
+        g_source_remove(m_idleTag);
+        m_idleTag = 0;
+        g_isIdle = true;
+        wxAddEmissionHook();
+    }
+}