Rebake for new tar streams.

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 77f619a9aa335279630e9d1d9562e7f1a69a1622..748f9d57d43d19b2550e89bfb4c2955dc22aac35 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,26 +7,43 @@
 // 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"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/memory.h"
+    #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/image.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/file.h"
+#include "wx/filename.h"
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+#include <gpe/init.h>

 #endif
 
 #endif
 

-#include "wx/module.h"
-#include "wx/image.h"
+#ifdef __WXUNIVERSAL__
+    #include "wx/univ/theme.h"
+    #include "wx/univ/renderer.h"
+#endif

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"


@@ -34,125 +51,179 @@
 
 #include <unistd.h>
 
 
 #include <unistd.h>
 

-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#ifdef HAVE_POLL
+    #if defined(__VMS)
+        #include <poll.h>
+    #else
+        // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
+        // in neither poll.h nor sys/poll.h which results in link errors later
+        #ifdef __OPENBSD__
+            extern "C"
+            {
+        #endif
+
+        #include <sys/poll.h>
+
+        #ifdef __OPENBSD__
+            };
+        #endif
+    #endif // platform
+#else // !HAVE_POLL
+    // we implement poll() ourselves using select() which is supposed exist in
+    // all modern Unices
+    #include <sys/types.h>
+    #include <sys/time.h>
+    #include <unistd.h>
+    #ifdef HAVE_SYS_SELECT_H
+        #include <sys/select.h>
+    #endif
+#endif // HAVE_POLL/!HAVE_POLL
+
+#include "wx/unix/private.h"
+#include "wx/gtk1/win_gtk.h"

 
 

-#include "wx/gtk/win_gtk.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

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

 gint   g_pendingTag = 0;
 
 gint   g_pendingTag = 0;
 

-GtkWidget *wxRootWindow = (GtkWidget*) NULL;
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;

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

-// local functions
+// idle system

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

-/* forward declaration */
-gint   wxapp_idle_callback( gpointer WXUNUSED(data) );
-gint   wxapp_pending_callback( gpointer WXUNUSED(data) );
-void   wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+void wxapp_install_idle_handler();

 
 #if wxUSE_THREADS
 
 #if wxUSE_THREADS

-gint   wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+static wxMutex gs_idleTagsMutex;

 #endif
 
 #endif
 

-//-----------------------------------------------------------------------------
-// wxExit
-//-----------------------------------------------------------------------------
-
-void wxExit()
-{
-    gtk_main_quit();
-}
-

 //-----------------------------------------------------------------------------
 // wxYield
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxYield
 //-----------------------------------------------------------------------------
 

-bool wxYield()
-{
-    bool has_idle = (wxTheApp->m_idleTag != 0);
+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = false;

 
 

-    if (has_idle)
+bool wxApp::Yield(bool onlyIfNeeded)
+{
+    if ( wxIsInsideYield )

     {
     {

-        /* We need to temporarily remove idle callbacks or the loop will
-           never finish. */
-        gtk_idle_remove( wxTheApp->m_idleTag );
-        wxTheApp->m_idleTag = 0;
-    }
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }

 
 

-    while (gtk_events_pending())
-        gtk_main_iteration();
+        return false;
+    }

 
 

-    if (has_idle)
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )

     {
     {

-        /* re-add idle handler (very low priority) */
-        wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+        // 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.
+    wxTheApp->RemoveIdleTag();

 
 

+#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();
     // 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) */
-    while (wxTheApp->ProcessIdle()) { }
+    // 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();
     // let the logs be flashed again
     wxLog::Resume();

+#endif

 
 

-    return TRUE;
+    wxIsInsideYield = false;
+
+    return true;

 }
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 

-void wxWakeUpIdle()
+// RR/KH: The wxMutexGui calls are not needed on GTK2 according to
+// the GTK faq, http://www.gtk.org/faq/#AEN500
+// The calls to gdk_threads_enter() and leave() are specifically noted
+// as not being necessary.  The MutexGui calls are still left in for GTK1.
+// Eliminating the MutexGui calls fixes the long-standing "random" lockup
+// when using wxPostEvent (which calls WakeUpIdle) from a thread.
+
+void wxApp::WakeUpIdle()

 {
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 {
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();

-#endif
+#endif // wxUSE_THREADS_

 
 

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    wxapp_install_idle_handler();

 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();

-#endif
+#endif // wxUSE_THREADS_

 }
 
 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------
 

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

 {
     if (!wxTheApp) return TRUE;
 {
     if (!wxTheApp) return TRUE;

-    
-    // when getting called from GDK's time-out handler
+
+    // When getting called from GDK's time-out handler

     // we are no longer within GDK's grab on the GUI
     // we are no longer within GDK's grab on the GUI

-    // thread so we must lock it here ourselves
+    // thread so we must lock it here ourselves.

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    // Sent idle event to all who request them
+    // Sent idle event to all who request them.

     wxTheApp->ProcessPendingEvents();
 
     wxTheApp->ProcessPendingEvents();
 

-    g_pendingTag = 0;
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        g_pendingTag = 0;
+    }
+
+    // Flush the logged messages if any.
+#if wxUSE_LOG
+    wxLog::FlushActive();
+#endif // wxUSE_LOG

 
     // Release lock again
     gdk_threads_leave();
 
     // Release lock again
     gdk_threads_leave();


@@ -162,111 +233,192 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) )
     return FALSE;
 }
 
     return FALSE;
 }
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )

 {
 {

-    if (!wxTheApp) return TRUE;
-    
-    // when getting called from GDK's time-out handler
+    if (!wxTheApp)
+        return TRUE;
+
+#ifdef __WXDEBUG__
+    // don't generate the idle events while the assert modal dialog is shown,
+    // this completely confuses the apps which don't expect to be reentered
+    // from some safely-looking functions
+    if ( wxTheApp->IsInAssert() )
+    {
+        // But repaint the assertion message if necessary
+        if (wxTopLevelWindows.GetCount() > 0)
+        {
+            wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
+            if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
+                win->OnInternalIdle();
+        }
+        return TRUE;
+    }
+#endif // __WXDEBUG__
+
+    // When getting called from GDK's time-out handler

     // we are no longer within GDK's grab on the GUI
     // we are no longer within GDK's grab on the GUI

-    // thread so we must lock it here ourselves
+    // thread so we must lock it here ourselves.

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    // Sent idle event to all who request them
-    while (wxTheApp->ProcessIdle()) { }
+    // Indicate that we are now in idle mode and event handlers
+    // will have to reinstall the idle handler again.
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        g_isIdle = TRUE;
+        wxTheApp->m_idleTag = 0;
+    }

 
 

-    /* Indicate that we are now in idle mode - even so deeply
-       in idle mode that we don't get any idle events anymore.
-       this is like wxMSW where an idle event is sent only
-       once each time after the event queue has been completely
-       emptied */
-    g_isIdle = TRUE;
-    wxTheApp->m_idleTag = 0;
+    // Send idle event to all who request them as long as
+    // no events have popped up in the event queue.
+    while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0))
+        ;

 
     // Release lock again
     gdk_threads_leave();
 
     // Return FALSE to indicate that no more idle events are
 
     // Release lock again
     gdk_threads_leave();
 
     // Return FALSE to indicate that no more idle events are

-    // to be sent (single shot instead of continuous stream)
+    // to be sent (single shot instead of continuous stream).

     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxapp_install_idle_handler()
-{
-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
+#if wxUSE_THREADS

 
 

-    if (g_pendingTag == 0)
-        g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
-        
-    /* 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. */
+#ifdef HAVE_POLL
+    #define wxPoll poll
+    #define wxPollFd pollfd
+#else // !HAVE_POLL

 
 

-    wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+typedef GPollFD wxPollFd;

 
 

-    g_isIdle = FALSE;
-}
+int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
+{
+    // convert timeout from ms to struct timeval (s/us)
+    timeval tv_timeout;
+    tv_timeout.tv_sec = timeout/1000;
+    tv_timeout.tv_usec = (timeout%1000)*1000;
+
+    // remember the highest fd used here
+    int fdMax = -1;
+
+    // and fill the sets for select()
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    wxFD_ZERO(&readfds);
+    wxFD_ZERO(&writefds);
+    wxFD_ZERO(&exceptfds);
+
+    unsigned int i;
+    for ( i = 0; i < nfds; i++ )
+    {
+        wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );

 
 

-#if wxUSE_THREADS
+        if ( ufds[i].events & G_IO_IN )
+            wxFD_SET(ufds[i].fd, &readfds);

 
 

-static int g_threadUninstallLevel = 0;
+        if ( ufds[i].events & G_IO_PRI )
+            wxFD_SET(ufds[i].fd, &exceptfds);

 
 

-void wxapp_install_thread_wakeup()
-{
-    g_threadUninstallLevel++;
-    
-    if (g_threadUninstallLevel != 1) return;
+        if ( ufds[i].events & G_IO_OUT )
+            wxFD_SET(ufds[i].fd, &writefds);

 
 

-    if (wxTheApp->m_wakeUpTimerTag) return;
+        if ( ufds[i].fd > fdMax )
+            fdMax = ufds[i].fd;
+    }

 
 

-    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL );
-}
+    fdMax++;
+    int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);

 
 

-void wxapp_uninstall_thread_wakeup()
-{
-    g_threadUninstallLevel--;
-    
-    if (g_threadUninstallLevel != 0) return;
+    // translate the results back
+    for ( i = 0; i < nfds; i++ )
+    {
+        ufds[i].revents = 0;

 
 

-    if (!wxTheApp->m_wakeUpTimerTag) return;
+        if ( wxFD_ISSET(ufds[i].fd, &readfds ) )
+            ufds[i].revents |= G_IO_IN;

 
 

-    gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
-    wxTheApp->m_wakeUpTimerTag = 0;
+        if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
+            ufds[i].revents |= G_IO_PRI;
+
+        if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
+            ufds[i].revents |= G_IO_OUT;
+    }
+
+    return res;

 }
 
 }
 

-gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+#endif // HAVE_POLL/!HAVE_POLL
+
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )

 {
 {

-    // 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();
 
     gdk_threads_enter();
 

-    wxapp_uninstall_thread_wakeup();
-
-    // unblock other threads wishing to do some GUI things

     wxMutexGuiLeave();
     wxMutexGuiLeave();

+    g_mainThreadLocked = true;

 
 

-    g_mainThreadLocked = TRUE;
-
-    // wake up other threads
-    wxUsleep( 1 );
+    // we rely on the fact that glib GPollFD struct is really just pollfd but
+    // I wonder how wise is this in the long term (VZ)
+    gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );

 
 

-    // block other thread again

     wxMutexGuiEnter();
     wxMutexGuiEnter();

+    g_mainThreadLocked = false;

 
 

-    g_mainThreadLocked = FALSE;
-
-    wxapp_install_thread_wakeup();
-
-    // release lock again

     gdk_threads_leave();
 
     gdk_threads_leave();
 

-    return TRUE;
+    return res;

 }
 
 #endif // wxUSE_THREADS
 
 }
 
 #endif // wxUSE_THREADS
 

+} // extern "C"
+
+void wxapp_install_idle_handler()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+
+    // Don't install the handler if it's already installed. This test *MUST*
+    // be done when gs_idleTagsMutex is locked!
+    if (!g_isIdle)
+        return;
+
+    // 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)") );
+
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
+
+    g_isIdle = false;
+
+    if (g_pendingTag == 0)
+        g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
+
+    // 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 = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+}
+
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
+{
+    if (gs_RootWindow == NULL)
+    {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;
+}
+

 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------


@@ -274,57 +426,66 @@ gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)

-    EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxAppBase::OnIdle)

 END_EVENT_TABLE()
 
 wxApp::wxApp()
 {
 END_EVENT_TABLE()
 
 wxApp::wxApp()
 {

-    wxTheApp = this;
-
-    m_topWindow = (wxWindow *) NULL;
-    m_exitOnFrameDelete = TRUE;
+#ifdef __WXDEBUG__
+    m_isInAssert = false;
+#endif // __WXDEBUG__

 
 

-    m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+    m_idleTag = 0;
+    g_isIdle = TRUE;
+    wxapp_install_idle_handler();

 
 #if wxUSE_THREADS
 
 #if wxUSE_THREADS

-    m_wakeUpTimerTag = 0;
-    wxapp_install_thread_wakeup();
+    g_main_set_poll_func( wxapp_poll_func );

 #endif
 
     m_colorCube = (unsigned char*) NULL;
 
 #endif
 
     m_colorCube = (unsigned char*) NULL;
 

-    m_useBestVisual = FALSE;
+    // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
+    m_glVisualInfo = (void *) NULL;
+    m_glFBCInfo = (void *) NULL;

 }
 
 wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 
 }
 
 wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 

-#if wxUSE_THREADS
-    wxapp_uninstall_thread_wakeup();
-#endif
-

     if (m_colorCube) free(m_colorCube);
 }
 
 bool wxApp::OnInitGui()
 {
     if (m_colorCube) free(m_colorCube);
 }
 
 bool wxApp::OnInitGui()
 {

+    if ( !wxAppBase::OnInitGui() )
+        return false;
+

     GdkVisual *visual = gdk_visual_get_system();
 
     GdkVisual *visual = gdk_visual_get_system();
 

-    /* on some machines, the default visual is just 256 colours, so
-       we make sure we get the best. this can sometimes be wasteful,
-       of course, but what do these guys pay $30.000 for? */
+    // 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 = gdkx_visual_get(
+            ((XVisualInfo *) m_glVisualInfo) ->visualid );
+        gtk_widget_set_default_visual( vis );
+
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+
+        visual = vis;
+    }

 
 

-    if ((gdk_visual_get_best() != gdk_visual_get_system()) &&
-        (m_useBestVisual))
+    // On some machines, the default visual is just 256 colours, so
+    // we make sure we get the best. This can sometimes be wasteful.
+
+    else
+    if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))

     {
     {

-#ifdef __WXGTK20__
-        /* seems gtk_widget_set_default_visual no longer exists? */
-        GdkVisual* vis = gtk_widget_get_default_visual();
-#else

         GdkVisual* vis = gdk_visual_get_best();
         gtk_widget_set_default_visual( vis );
         GdkVisual* vis = gdk_visual_get_best();
         gtk_widget_set_default_visual( vis );

-#endif

 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );


@@ -332,10 +493,10 @@ bool wxApp::OnInitGui()
         visual = vis;
     }
 
         visual = vis;
     }
 

-    /* Nothing to do for 15, 16, 24, 32 bit displays */
+    // Nothing to do for 15, 16, 24, 32 bit displays

     if (visual->depth > 8) return TRUE;
 
     if (visual->depth > 8) return TRUE;
 

-    /* initialize color cube for 8-bit color reduction dithering */
+    // initialize color cube for 8-bit color reduction dithering

 
     GdkColormap *cmap = gtk_widget_get_default_colormap();
 
 
     GdkColormap *cmap = gtk_widget_get_default_colormap();
 


@@ -372,446 +533,165 @@ bool wxApp::OnInitGui()
                 }
                 else
                 {
                 }
                 else
                 {

-#if (GTK_MINOR_VERSION > 0)
-                    /* assume 8-bit true or static colors. this really
-                       exists. */
+                    // assume 8-bit true or static colors. this really exists

                     GdkVisual* vis = gdk_colormap_get_visual( cmap );
                     index = (r >> (5 - vis->red_prec)) << vis->red_shift;
                     index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                     index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
                     GdkVisual* vis = gdk_colormap_get_visual( cmap );
                     index = (r >> (5 - vis->red_prec)) << vis->red_shift;
                     index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                     index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;

-#else
-                    wxFAIL_MSG( wxT("Unsupported graphics hardware") );
-#endif

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

-    return TRUE;
-}
-
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject( this );
-    ProcessEvent( event );
-
-    return event.MoreRequested();
+    return true;

 }
 
 }
 

-void wxApp::OnIdle( wxIdleEvent &event )
+GdkVisual *wxApp::GetGdkVisual()

 {
 {

-    static bool s_inOnIdle = FALSE;
+    GdkVisual *visual = NULL;

 
 

-    /* Avoid recursion (via ProcessEvent default case) */
-    if (s_inOnIdle)
-        return;
-
-    s_inOnIdle = TRUE;
-
-    /* Resend in the main thread events which have been prepared in other
-       threads */
-    ProcessPendingEvents();
-
-    /* 'Garbage' collection of windows deleted with Close(). */
-    DeletePendingObjects();
-
-    /* Send OnIdle events to all windows */
-    bool needMore = SendIdleEvents();
-
-    if (needMore)
-        event.RequestMore(TRUE);
+    if (m_glVisualInfo)
+        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+    else
+        visual = gdk_window_get_visual( wxGetRootWindow()->window );

 
 

-    s_inOnIdle = FALSE;
+    wxASSERT( visual );

 
 

-    /* flush the logged messages if any */
-#if wxUSE_LOG
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
+    return visual;

 }
 
 }
 

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

 {
 {

-    bool needMore = FALSE;
+    bool init_result;

 
 

-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
+#if wxUSE_THREADS
+    // GTK 1.2 up to version 1.2.3 has broken threads
+    if ((gtk_major_version == 1) &&
+        (gtk_minor_version == 2) &&
+        (gtk_micro_version < 4))

     {
     {

-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
+        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );

     }
     }

-
-    return needMore;
-}
-
-bool wxApp::SendIdleEvents( wxWindow* win )
-{
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-
-    win->GetEventHandler()->ProcessEvent(event);
-
-    win->OnInternalIdle();
-
-    if (event.MoreRequested())
-        needMore = TRUE;
-
-    wxNode* node = win->GetChildren().First();
-    while (node)
+    else

     {
     {

-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->Next();
+        if (!g_thread_supported())
+            g_thread_init(NULL);

     }
     }

-    return needMore ;
-}
-
-int wxApp::MainLoop()
-{
-    gtk_main();
-    return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
-    if (gtk_main_level() > 0)
-        gtk_main_quit();
-}
+#endif // wxUSE_THREADS

 
 

-bool wxApp::Initialized()
-{
-    return m_initialized;
-}
+    gtk_set_locale();

 
 

-bool wxApp::Pending()
-{
-    return (gtk_events_pending() > 0);
-}
+    // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
+        if (!wxOKlibc())
+            wxConvCurrent = &wxConvLocal;
+#else // !wxUSE_WCHAR_T
+    if (!wxOKlibc())
+        wxConvCurrent = (wxMBConv*) NULL;
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

 
 

-void wxApp::Dispatch()
-{
-    gtk_main_iteration();
-}
-
-void wxApp::DeletePendingObjects()
-{
-    wxNode *node = wxPendingDelete.First();
-    while (node)
+#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++ )

     {
     {

-        wxObject *obj = (wxObject *)node->Data();
-
-        delete obj;
-
-        if (wxPendingDelete.Find(obj))
-            delete node;
-
-        node = wxPendingDelete.First();
+        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));

     }
     }

-}
-
-bool wxApp::Initialize()
-{
-    wxBuffer = new wxChar[BUFSIZ + 512];

 
 

-    wxClassInfo::InitializeClasses();
+    argvGTK[argc] = NULL;

 
 

-    wxSystemSettings::Init();
+    int argcGTK = argc;

 
 

-    // 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
-    wxPendingEvents = new wxList();
-    wxPendingEventsLocker = new wxCriticalSection();
-#endif
-
-    wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-
-    return TRUE;
-}
-
-void wxApp::CleanUp()
-{
-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-
-    if (wxTheColourDatabase)
-        delete wxTheColourDatabase;
-
-    wxTheColourDatabase = (wxColourDatabase*) NULL;
-
-    wxDeleteStockObjects();
-
-    wxDeleteStockLists();
-
-    delete wxTheApp;
-    wxTheApp = (wxApp*) NULL;
-
-    // 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;
+#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
 

-    wxSystemSettings::Done();
-
-    delete[] wxBuffer;
-
-    wxClassInfo::CleanUpClasses();
-
-    // check for memory leaks
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+    if ( argcGTK != argc )

     {
     {

-        wxLogDebug(wxT("There were memory leaks.\n"));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif // Debug
-
-#if wxUSE_LOG
-    // 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;
-#endif // wxUSE_LOG
-}
-
-//-----------------------------------------------------------------------------
-// wxEntry
-//-----------------------------------------------------------------------------
-
+        // 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);
+            }
+        }

 
 

-int wxEntryStart( int argc, char *argv[] )
-{
-#if wxUSE_THREADS
-    /* GTK 1.2 up to version 1.2.3 has broken threads */
-#ifdef __VMS__
-   if ((vms_gtk_major_version() == 1) &&
-        (vms_gtk_minor_version() == 2) &&
-        (vms_gtk_micro_version() < 4))
-#else
-   if ((gtk_major_version == 1) &&
-        (gtk_minor_version == 2) &&
-        (gtk_micro_version < 4))
-#endif
-    {
-        printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+        argc = argcGTK;

     }
     }

-    else
+    //else: gtk_init() didn't modify our parameters
+
+    // free our copy
+    for ( i = 0; i < argcGTK; i++ )

     {
     {

-        g_thread_init(NULL);
+        free(argvGTK[i]);

     }
     }

-#endif

 
 

-    gtk_set_locale();
+    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

 
 

-#if defined(__WXGTK20__)
-    // gtk+ 2.0 supports Unicode through UTF-8 strings
-    wxConvCurrent = &wxConvUTF8;
-#elif wxUSE_WCHAR_T
-    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
-#else
-    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
-#endif
+    if (!init_result) {
+        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+        return false;
+    }

 
 

+    // we can not enter threads before gtk_init is done

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    gtk_init( &argc, &argv );
-
-    wxSetDetectableAutoRepeat( TRUE );
-
-    if (!wxApp::Initialize())
+    if ( !wxAppBase::Initialize(argc, argv) )

     {
         gdk_threads_leave();
     {
         gdk_threads_leave();

-        return -1;
-    }
-
-    return 0;
-}

 
 

+        return false;
+    }

 
 

-int wxEntryInitGui()
-{
-    int retValue = 0;
-
-    if ( !wxTheApp->OnInitGui() )
-        retValue = -1;
+    wxSetDetectableAutoRepeat( TRUE );

 
 

-    wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-    gtk_widget_realize( wxRootWindow );
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-    return retValue;
+    return true;

 }
 
 }
 

-
-void wxEntryCleanup()
+void wxApp::CleanUp()

 {
 {

-#if wxUSE_LOG
-    // 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;
-#endif // wxUSE_LOG
-
-    wxApp::CleanUp();
-

     gdk_threads_leave();
     gdk_threads_leave();

-}

 
 

+    wxAppBase::CleanUp();
+}

 
 

+#ifdef __WXDEBUG__

 
 

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

 {
 {

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // This seems to be necessary since there are 'rogue'
-    // objects present at this point (perhaps global objects?)
-    // Setting a checkpoint will ignore them as far as the
-    // memory checking facility is concerned.
-    // Of course you may argue that memory allocated in globals should be
-    // checked, but this is a reasonable compromise.
-    wxDebugContext::SetCheckpoint();
-#endif
-    int err = wxEntryStart(argc, argv);
-    if (err)
-        return err;
+    m_isInAssert = true;

 
 

-    if (!wxTheApp)
-    {
-        wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
-                     wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
-
-        wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
+    wxAppBase::OnAssert(file, line, cond, msg);

 
 

-        wxObject *test_app = app_ini();
-
-        wxTheApp = (wxApp*) test_app;
-    }
-
-    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
-
-    wxTheApp->argc = argc;
-#if wxUSE_UNICODE
-    wxTheApp->argv = new wxChar*[argc+1];
-    int mb_argc = 0;
-    while (mb_argc < argc)
-    {
-        wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
-        mb_argc++;
-    }
-    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
-#else
-    wxTheApp->argv = argv;
-#endif
-
-    wxString name(wxFileNameFromPath(argv[0]));
-    wxStripExtension( name );
-    wxTheApp->SetAppName( name );
-
-    int retValue;
-    retValue = wxEntryInitGui();
-
-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
-    if ( retValue == 0 )
-    {
-        if ( !wxTheApp->OnInit() )
-            retValue = -1;
-    }
-
-    if ( retValue == 0 )
-    {
-        /* delete pending toplevel windows (typically a single
-           dialog) so that, if there isn't any left, we don't
-           call OnRun() */
-        wxTheApp->DeletePendingObjects();
-
-        wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
-
-        if (wxTheApp->Initialized())
-        {
-            wxTheApp->OnRun();
-
-            wxWindow *topWindow = wxTheApp->GetTopWindow();
-            if (topWindow)
-            {
-                /* 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 );
-                }
-            }
-
-            retValue = wxTheApp->OnExit();
-        }
-    }
-
-    wxEntryCleanup();
-
-    return retValue;
+    m_isInAssert = false;

 }
 
 }
 

-#include "wx/gtk/info.xpm"
-#include "wx/gtk/error.xpm"
-#include "wx/gtk/question.xpm"
-#include "wx/gtk/warning.xpm"
+#endif // __WXDEBUG__

 
 

-wxIcon
-wxApp::GetStdIcon(int which) const
+void wxApp::RemoveIdleTag()

 {
 {

-    switch(which)
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+    if (!g_isIdle)

     {
     {

-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
-
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
-
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
-
-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
-
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
+        gtk_idle_remove( wxTheApp->m_idleTag );
+        wxTheApp->m_idleTag = 0;
+        g_isIdle = true;

     }
 }
     }
 }