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 584837f9c7015402912d5393faaf41dd5b0c5f5b..fa47355e8fae1c4257dfa1bdbc17c9a1b60a1dee 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,631 +7,559 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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/intl.h"
-#include "wx/log.h"
-#include "wx/memory.h"
-#include "wx/font.h"
-#include "wx/settings.h"
-#include "wx/dialog.h"
-
-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif

 
 

-#include "wx/module.h"
-#include "wx/image.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"
 
 
 #include "wx/thread.h"
 

-#include "unistd.h"
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#ifdef __WXGPE__
+    #include <gpe/init.h>
+#endif

 
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/win_gtk.h"

+#include "wx/gtk/private.h"
+
+#include <gdk/gdkx.h>

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

-// global data
+// link GnomeVFS

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

-wxApp *wxTheApp = (wxApp *)  NULL;
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
-
-extern wxList wxPendingDelete;
-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_vfs)

 #endif
 #endif

-extern wxResourceCache *wxTheResourceCache;

 
 

-unsigned char g_palette[64*3] =
-{
-  0x0,  0x0,  0x0,
-  0xff, 0xff, 0xff,
-  0xff, 0x0,  0x0,
-  0xff, 0xff, 0x0,
-  0x0,  0xff, 0x0,
-  0x0,  0x0,  0xff,
-  0x0,  0xff, 0xff,
-  0x99, 0x99, 0x99,
-  0xff, 0x88, 0x0,
-  0x88, 0x0,  0x0,
-  0x0,  0x88, 0x88,
-  0x88, 0x88, 0x0,
-  0xff, 0xcc, 0x97,
-  0xbb, 0xbb, 0xbb,
-  0x9f, 0x6b, 0x42,
-  0x55, 0x55, 0x55,
-  0xdd, 0xdd, 0xdd,
-  0x77, 0x77, 0x77,
-  0x33, 0x33, 0x33,
-  0xcc, 0x0,  0x0,
-  0xff, 0x44, 0x0,
-  0xff, 0xcc, 0x0,
-  0xcc, 0xcc, 0x0,
-  0x60, 0x60, 0x0,
-  0x0,  0x43, 0x0,
-  0x0,  0x7f, 0x0,
-  0x0,  0xcc, 0x0,
-  0x0,  0x44, 0x44,
-  0x0,  0x0,  0x44,
-  0x0,  0x0,  0x88,
-  0xef, 0xb1, 0x7b,
-  0xdf, 0x98, 0x5f,
-  0xbf, 0x87, 0x56,
-  0x7f, 0x57, 0x26,
-  0x5f, 0x39, 0xc,
-  0x3f, 0x1c, 0x0,
-  0x21, 0x0,  0x0,
-  0x0,  0x43, 0x87,
-  0x2d, 0x70, 0xaf,
-  0x5a, 0x9e, 0xd7,
-  0x87, 0xcc, 0xff,
-  0xff, 0xe0, 0xba,
-  0x21, 0x43, 0xf,
-  0x3d, 0x5d, 0x25,
-  0x59, 0x78, 0x3a,
-  0x75, 0x93, 0x4f,
-  0x91, 0xae, 0x64,
-  0xad, 0xc8, 0x7a,
-  0xf0, 0xa8, 0xef,
-  0xd0, 0x88, 0xd0,
-  0xaf, 0x66, 0xaf,
-  0x8e, 0x44, 0x8e,
-  0x6d, 0x22, 0x6d,
-  0x4b, 0x0,  0x4b,
-  0xff, 0xc0, 0xbc,
-  0xff, 0x93, 0x91,
-  0xff, 0x66, 0x67,
-  0xd8, 0xf2, 0xbf,
-  0xff, 0xc9, 0x68,
-  0xff, 0x96, 0x67,
-  0xa5, 0x60, 0xff,
-  0x51, 0xff, 0x99,
-  0x3f, 0xa5, 0x63,
-  0x98, 0x90, 0x67
-};
+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+bool   g_mainThreadLocked = false;
+
+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()
+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = false;
+
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-    gtk_main_quit();
-}
+    if ( wxIsInsideYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }

 
 

-// forward decl
-gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+        return false;
+    }

 
 

-bool wxYield()
-{
-    // 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)
-    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
-          node;
-          node = node->GetNext() )
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )

     {
     {

-        wxWindow *win = node->GetData();
-        win->OnInternalIdle();
+        // can't call gtk_main_iteration() from other threads like this
+        return true;

     }
     }

+#endif // wxUSE_THREADS

 
 

-    // We need to temporarily remove idle callbacks or the loop will
+    wxIsInsideYield = true;
+
+    // We need to remove idle callbacks or the loop will

     // never finish.
     // never finish.

-    gtk_idle_remove( wxTheApp->m_idleTag );
-    
+    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();
 
     while (gtk_events_pending())
         gtk_main_iteration();
 

-    wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
-    return TRUE;
+    // 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)
-
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+// RR/KH: No wxMutexGui calls are needed here according to the GTK faq,
+// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent.

 
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+void wxApp::WakeUpIdle()

 {
 {

-    if (wxTheApp)
-    {
-        while (wxTheApp->ProcessIdle())
-        {
-        }
-    }
-
-    wxMutexGuiLeave();
-    wxUsleep(10);
-    wxMutexGuiEnter();
-
-    return TRUE;
+    wxapp_install_idle_handler();

 }
 
 }
 

-wxApp::wxApp()
-{
-    wxTheApp = this;
-
-    m_topWindow = (wxWindow *) NULL;
-    m_exitOnFrameDelete = TRUE;
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------

 
 

-    m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+// the callback functions must be extern "C" to comply with GTK+ declarations
+extern "C"
+{

 
 

-    m_colorCube = (unsigned char*) NULL;
+// 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)
+{
+    wxapp_install_idle_handler();
+    // remove hook
+    return false;

 }
 
 }
 

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

 {
 {

-    gtk_idle_remove( m_idleTag );
-
-    if (m_colorCube) free(m_colorCube);
+    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::OnInitGui()
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )

 {
 {

-    /* Nothing to do for 15, 16, 24, 32 bit displays */
+    // 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();
+        }

 
 

-    GdkVisual *visual = gdk_visual_get_system();
-    if (visual->depth > 8) return TRUE;
+        // 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();

 
 

-        /* this initiates the standard palette as defined by GdkImlib
-           in the GNOME libraries. it ensures that all GNOME applications
-           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... */
+        // 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);

 
 

-        /*
-        GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
+        // Release lock again
+        gdk_threads_leave();

 
 

-        for (int i = 0; i < 64; i++)

         {
         {

-            GdkColor col;
-            col.red    = g_palette[i*3 + 0] << 8;
-            col.green  = g_palette[i*3 + 1] << 8;
-            col.blue   = g_palette[i*3 + 2] << 8;
-            col.pixel  = 0;
-
-            gdk_color_alloc( cmap, &col );
+            // 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;

         }
         }

+    }

 
 

-        gtk_widget_set_default_colormap( cmap );
-        */
-
-    /* initialize color cube for 8-bit color reduction dithering */
+    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;

 
 

-    GdkColormap *cmap = gtk_widget_get_default_colormap();
+        wxAddEmissionHook();
+    }

 
 

-    m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
+    // Return FALSE if no more idle events are to be sent
+    return moreIdles;
+}
+} // extern "C"

 
 

-     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);
+#if wxUSE_THREADS

 
 

-                GdkColor *colors = cmap->colors;
-                int max = 3 * (65536);
-                int index = -1;
+static GPollFunc wxgs_poll_func;

 
 

-                for (int i = 0; i < cmap->size; i++)
-                {
-                    int rdiff = ((rr << 8) - colors[i].red);
-                    int gdiff = ((gg << 8)- colors[i].green);
-                    int bdiff = ((bb << 8)- colors[i].blue);
-                    int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                    if (sum < max) { index = i; max = sum; }
-                }
+extern "C" {
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
+{
+    gdk_threads_enter();

 
 

-               m_colorCube[ (r*1024) + (g*32) + b ] = index;
-           }
-       }
-    }
+    wxMutexGuiLeave();
+    g_mainThreadLocked = true;

 
 

+    gint res = (*wxgs_poll_func)(ufds, nfds, timeout);

 
 

-    return TRUE;
-}
+    wxMutexGuiEnter();
+    g_mainThreadLocked = false;

 
 

-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject( this );
-    ProcessEvent( event );
+    gdk_threads_leave();

 
 

-    return event.MoreRequested();
+    return res;
+}

 }
 
 }
 

-void wxApp::OnIdle( wxIdleEvent &event )
-{
-    static bool inOnIdle = FALSE;
+#endif // wxUSE_THREADS

 
 

-    /* Avoid recursion (via ProcessEvent default case) */
-    if (inOnIdle)
+void wxapp_install_idle_handler()
+{
+    if (wxTheApp == NULL)

         return;
 
         return;
 

-    inOnIdle = TRUE;
-

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    /* Resend in the main thread events which have been prepared in other
-       threads */
-    ProcessPendingEvents();
+    wxMutexLocker lock(gs_idleTagsMutex);

 #endif
 
 #endif
 

-    /* 'Garbage' collection of windows deleted with Close(). */
-    DeletePendingObjects();
+    // Don't install the handler if it's already installed. This test *MUST*
+    // be done when gs_idleTagsMutex is locked!
+    if (!g_isIdle)
+        return;

 
 

-    /* flush the logged messages if any */
-    wxLog *log = wxLog::GetActiveTarget();
-    if (log != NULL && log->HasPendingMessages())
-        log->Flush();
+    // 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)") );

 
 

-    /* Send OnIdle events to all windows */
-    bool needMore = SendIdleEvents();
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );

 
 

-    if (needMore)
-        event.RequestMore(TRUE);
+    g_isIdle = false;

 
 

-    inOnIdle = FALSE;
+    // 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);

 }
 
 }
 

-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------

 
 

-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
+GtkWidget* wxGetRootWindow()
+{
+    if (gs_RootWindow == NULL)

     {
     {

-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );

     }
     }

-
-    return needMore;
+    return gs_RootWindow;

 }
 
 }
 

-bool wxApp::SendIdleEvents( wxWindow* win )
-{
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-
-    win->OnInternalIdle();
-
-    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;
+//-----------------------------------------------------------------------------
+// wxApp
+//-----------------------------------------------------------------------------

 
 

-        node = node->Next();
-    }
-    return needMore ;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)

 
 

-int wxApp::MainLoop()
-{
-    gtk_main();
-    return 0;
-}
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxAppBase::OnIdle)
+END_EVENT_TABLE()

 
 

-void wxApp::ExitMainLoop()
+wxApp::wxApp()

 {
 {

-    gtk_main_quit();
-}
+#ifdef __WXDEBUG__
+    m_isInAssert = false;
+#endif // __WXDEBUG__

 
 

-bool wxApp::Initialized()
-{
-    return m_initialized;
-}
+    m_idleTag = 0;
+    g_isIdle = true;
+    wxapp_install_idle_handler();

 
 

-bool wxApp::Pending()
-{
-    return FALSE;
+    // 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()
+wxApp::~wxApp()

 {
 {

+    if (m_idleTag)
+        g_source_remove( m_idleTag );

 }
 
 }
 

-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
+bool wxApp::OnInitGui()

 {
 {

-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
+    if ( !wxAppBase::OnInitGui() )
+        return false;

 
 

-    while (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)

     {
     {

-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+        GdkVisual* vis = gtk_widget_get_default_visual();

 
 

-        handler->ProcessPendingEvents();
-
-        delete node;
-
-        node = wxPendingEvents->First();
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );

     }
     }

-}
-#endif
-
-void wxApp::DeletePendingObjects()
-{
-    wxNode *node = wxPendingDelete.First();
-    while (node)
+    else

     {
     {

-        wxObject *obj = (wxObject *)node->Data();
-
-        delete obj;
-
-        if (wxPendingDelete.Member(obj))
-        delete node;
-
-        node = wxPendingDelete.First();
+        // 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()
+GdkVisual *wxApp::GetGdkVisual()

 {
 {

-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.GetCount() > 0)
-        return wxTopLevelWindows.GetFirst()->GetData();
+    GdkVisual *visual = NULL;
+
+    if (m_glVisualInfo)
+        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );

     else
     else

-        return NULL;
-}
+        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );

 
 

-void wxApp::SetTopWindow( wxWindow *win )
-{
-    m_topWindow = win;
+    wxASSERT( visual );
+
+    return visual;

 }
 
 }
 

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

 {
 {

-    wxBuffer = new char[BUFSIZ + 512];
-
-    wxClassInfo::InitializeClasses();
-
-    wxSystemSettings::Init();
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;

 
 

-    // GL: I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxPendingEvents = new wxList();
-    wxPendingEventsLocker = new wxCriticalSection();
-#endif
-
-/*
-    wxTheFontNameDirectory =  new wxFontNameDirectory;
-    wxTheFontNameDirectory->Initialize();
-*/
-
-    wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
-
-    wxInitializeResourceSystem();
-#endif
+    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");

 
 

-    wxImage::InitStandardHandlers();
+    // 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();

 
 

-    /* no global cursor under X
-       g_globalCursor = new wxCursor; */
+#endif // wxUSE_INTL
+    static wxConvBrokenFileNames fileconv(encName);
+    wxConvFileName = &fileconv;

 
 

-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;

 
 

-    return TRUE;
-}
+    bool init_result;

 
 

-void wxApp::CleanUp()
-{
-    wxModule::CleanUpModules();
+#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]));
+    }

 
 

-#if wxUSE_WX_RESOURCES
-    wxFlushResources();
+    argvGTK[argc] = NULL;

 
 

-    if (wxTheResourceCache)
-        delete wxTheResourceCache;
-    wxTheResourceCache = (wxResourceCache*) NULL;
+    int argcGTK = argc;

 
 

-    wxCleanUpResourceSystem();
+#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 (wxTheColourDatabase)
-        delete wxTheColourDatabase;
-    wxTheColourDatabase = (wxColourDatabase*) NULL;
-
-/*
-    if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
-    wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
-*/
-
-    wxDeleteStockObjects();
-
-    wxDeleteStockLists();
+    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));
+            }
+        }

 
 

-    wxImage::CleanUpHandlers();
+        argc = argcGTK;
+    }
+    //else: gtk_init() didn't modify our parameters

 
 

-    delete wxTheApp;
-    wxTheApp = (wxApp*) NULL;
+    // free our copy
+    for ( i = 0; i < argcGTK; i++ )
+    {
+        free(argvGTK[i]);
+    }

 
 

-    // GL: I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
+    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

 
 

-    wxSystemSettings::Done();
+    if (!init_result) {
+        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+        return false;
+    }

 
 

-    delete[] wxBuffer;
+    // we can not enter threads before gtk_init is done
+    gdk_threads_enter();

 
 

-    wxClassInfo::CleanUpClasses();
+    wxSetDetectableAutoRepeat( true );

 
 

-    // check for memory leaks
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    if (wxDebugContext::CountObjectsLeft() > 0)
-    {
-        wxLogDebug("There were memory leaks.\n");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());

 #endif
 
 #endif
 

-    // do this as the very last thing because everything else can log messages
-    wxLog::DontCreateOnDemand();
-
-    wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
-    if (oldLog)
-        delete oldLog;
+    return true;

 }
 
 }
 

-wxLog *wxApp::CreateLogTarget()
+void wxApp::CleanUp()

 {
 {

-    return new wxLogGui;
+    gdk_threads_leave();
+
+    wxAppBase::CleanUp();

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxEntry
-//-----------------------------------------------------------------------------
+#ifdef __WXDEBUG__

 
 

-int wxEntry( int argc, char *argv[] )
+void wxApp::OnAssertFailure(const wxChar *file,
+                            int line,
+                            const wxChar* func,
+                            const wxChar* cond,
+                            const wxChar *msg)

 {
 {

-    gtk_set_locale();
-
-    gtk_init( &argc, &argv );
-
-    if (!wxApp::Initialize())
-        return -1;

 
 

-    if (!wxTheApp)
-    {
-        wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
-                     "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-
-        wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
-
-        wxObject *test_app = app_ini();
-
-        wxTheApp = (wxApp*) test_app;
-    }
-
-    wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" );
+    // block wx idle events while assert dialog is showing
+    m_isInAssert = true;

 
 

-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
+    wxAppBase::OnAssertFailure(file, line, func, cond, msg);

 
 

-    char name[200];
-    strcpy( name, argv[0] );
-    strcpy( name, wxFileNameFromPath(name) );
-    wxStripExtension( name );
-    wxTheApp->SetAppName( name );
-
-    if (!wxTheApp->OnInitGui())
-        return 0;
-
-    /* Here frames insert themselves automatically
-     * into wxTopLevelWindows by getting created
-     * in OnInit(). */
-
-    if (!wxTheApp->OnInit())
-        return 0;
-
-    wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
-
-    int retValue = 0;
+    m_isInAssert = false;
+}

 
 

-    if (wxTheApp->Initialized())
-        retValue = wxTheApp->OnRun();
+#endif // __WXDEBUG__

 
 

-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if (topWindow)
+void wxApp::SuspendIdleCallback()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+    if (m_idleTag != 0)

     {
     {

-        // 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 );
-        }
+        g_source_remove(m_idleTag);
+        m_idleTag = 0;
+        g_isIdle = true;
+        wxAddEmissionHook();

     }
     }

-
-    wxTheApp->OnExit();
-
-    // flush the logged messages if any
-    wxLog *log = wxLog::GetActiveTarget();
-    if (log != NULL && log->HasPendingMessages())
-        log->Flush();
-
-    // continuing to use user defined log target is unsafe from now on because
-    // some resources may be already unavailable, so replace it by something
-    // more safe
-    wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
-    if ( oldlog )
-        delete oldlog;
-
-    wxApp::CleanUp();
-
-    return retValue;

 }
 }

-