test that the candidate parent window isn't being deleted (this would result in a...

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index b7ce136139ce62844efd135accfbe25430c97f7c..c7d9c5b71f83b5f912088492d9bc517fe3a2b8a6 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,29 +7,38 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "app.h"
-#endif
-

 #ifdef __VMS
 #ifdef __VMS

-#include <vms_jackets.h>
+// vms_jackets.h should for proper working be included before anything else
+# include <vms_jackets.h>

 #undef ConnectionNumber
 #endif
 
 #undef ConnectionNumber
 #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"
-#include "wx/msgdlg.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/file.h"
 #include "wx/filename.h"

-#include "wx/module.h"
-#include "wx/image.h"
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+#include <gpe/init.h>
+#endif

 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"


@@ -65,18 +74,21 @@
     #include <sys/types.h>
     #include <sys/time.h>
     #include <unistd.h>
     #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
 
 #endif // HAVE_POLL/!HAVE_POLL
 

-#include "wx/gtk/win_gtk.h"
+#include "wx/unix/private.h"
+#include "wx/gtk1/win_gtk.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-

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

-bool   g_mainThreadLocked = FALSE;
+bool   g_mainThreadLocked = false;

 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;


@@ -89,6 +101,10 @@ extern bool g_isIdle;
 
 void wxapp_install_idle_handler();
 
 
 void wxapp_install_idle_handler();
 

+#if wxUSE_THREADS
+static wxMutex gs_idleTagsMutex;
+#endif
+

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


@@ -96,7 +112,7 @@ void wxapp_install_idle_handler();
 // not static because used by textctrl.cpp
 //
 // MT-FIXME
 // not static because used by textctrl.cpp
 //
 // MT-FIXME

-bool wxIsInsideYield = FALSE;
+bool wxIsInsideYield = false;

 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {


@@ -107,31 +123,28 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't call gtk_main_iteration() from other threads like this
     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't call gtk_main_iteration() from other threads like this

-        return TRUE;
+        return true;

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

-    wxIsInsideYield = TRUE;
+    wxIsInsideYield = true;

 
 

-    if (!g_isIdle)
-    {
-        // We need to remove idle callbacks or the loop will
-        // never finish.
-        gtk_idle_remove( m_idleTag );
-        m_idleTag = 0;
-        g_isIdle = 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();
 
     while (gtk_events_pending())
         gtk_main_iteration();


@@ -144,32 +157,40 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // return value of Processidle().
     ProcessIdle();
 
     // 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

 
 

-    wxIsInsideYield = FALSE;
+    wxIsInsideYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // 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();
 void wxApp::WakeUpIdle()
 {
 #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_

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -192,7 +213,12 @@ static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
     // Sent idle event to all who request them.
     wxTheApp->ProcessPendingEvents();
 
     // Sent idle event to all who request them.
     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
 
     // Flush the logged messages if any.
 #if wxUSE_LOG


@@ -222,11 +248,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();

-#ifdef __WXGTK20__
-            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
-#else

             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))

-#endif

                 win->OnInternalIdle();
         }
         return TRUE;
                 win->OnInternalIdle();
         }
         return TRUE;


@@ -240,8 +262,13 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
     // Indicate that we are now in idle mode and event handlers
     // will have to reinstall the idle handler again.
 
     // 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;
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        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.
 
     // Send idle event to all who request them as long as
     // no events have popped up in the event queue.


@@ -279,9 +306,9 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;

-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    FD_ZERO(&exceptfds);
+    wxFD_ZERO(&readfds);
+    wxFD_ZERO(&writefds);
+    wxFD_ZERO(&exceptfds);

 
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
 
     unsigned int i;
     for ( i = 0; i < nfds; i++ )


@@ -289,13 +316,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
         wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
 
         if ( ufds[i].events & G_IO_IN )
         wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
 
         if ( ufds[i].events & G_IO_IN )

-            FD_SET(ufds[i].fd, &readfds);
+            wxFD_SET(ufds[i].fd, &readfds);

 
         if ( ufds[i].events & G_IO_PRI )
 
         if ( ufds[i].events & G_IO_PRI )

-            FD_SET(ufds[i].fd, &exceptfds);
+            wxFD_SET(ufds[i].fd, &exceptfds);

 
         if ( ufds[i].events & G_IO_OUT )
 
         if ( ufds[i].events & G_IO_OUT )

-            FD_SET(ufds[i].fd, &writefds);
+            wxFD_SET(ufds[i].fd, &writefds);

 
         if ( ufds[i].fd > fdMax )
             fdMax = ufds[i].fd;
 
         if ( ufds[i].fd > fdMax )
             fdMax = ufds[i].fd;


@@ -309,13 +336,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     {
         ufds[i].revents = 0;
 
     {
         ufds[i].revents = 0;
 

-        if ( FD_ISSET(ufds[i].fd, &readfds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &readfds ) )

             ufds[i].revents |= G_IO_IN;
 
             ufds[i].revents |= G_IO_IN;
 

-        if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )

             ufds[i].revents |= G_IO_PRI;
 
             ufds[i].revents |= G_IO_PRI;
 

-        if ( FD_ISSET(ufds[i].fd, &writefds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &writefds ) )

             ufds[i].revents |= G_IO_OUT;
     }
 
             ufds[i].revents |= G_IO_OUT;
     }
 


@@ -329,14 +356,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
     gdk_threads_enter();
 
     wxMutexGuiLeave();
     gdk_threads_enter();
 
     wxMutexGuiLeave();

-    g_mainThreadLocked = TRUE;
+    g_mainThreadLocked = true;

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

-    g_mainThreadLocked = FALSE;
+    g_mainThreadLocked = false;

 
     gdk_threads_leave();
 
 
     gdk_threads_leave();
 


@@ -349,6 +376,15 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 
 void wxapp_install_idle_handler()
 {
 
 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?
     // 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?


@@ -356,7 +392,7 @@ void wxapp_install_idle_handler()
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 

-    g_isIdle = FALSE;
+    g_isIdle = false;

 
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
 
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );


@@ -390,17 +426,17 @@ GtkWidget* wxGetRootWindow()
 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()
 {

-    m_initialized = FALSE;

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     m_idleTag = 0;
 #endif // __WXDEBUG__
 
     m_idleTag = 0;

+    g_isIdle = TRUE;

     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS


@@ -411,6 +447,7 @@ wxApp::wxApp()
 
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 
     // 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()
 }
 
 wxApp::~wxApp()


@@ -423,7 +460,7 @@ wxApp::~wxApp()
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )

-        return FALSE;
+        return false;

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


@@ -431,14 +468,9 @@ bool wxApp::OnInitGui()
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {

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

         GdkVisual* vis = gdkx_visual_get(
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
         GdkVisual* vis = gdkx_visual_get(
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         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 );


@@ -452,13 +484,8 @@ bool wxApp::OnInitGui()
     else
     if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {
     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 );


@@ -517,7 +544,7 @@ bool wxApp::OnInitGui()
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 GdkVisual *wxApp::GetGdkVisual()
 }
 
 GdkVisual *wxApp::GetGdkVisual()


@@ -534,156 +561,22 @@ GdkVisual *wxApp::GetGdkVisual()
     return visual;
 }
 
     return visual;
 }
 

-bool wxApp::ProcessIdle()
-{
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        CallInternalIdle( win );
-
-        node = node->GetNext();
-    }
-
-    wxIdleEvent event;
-    event.SetEventObject( this );
-    ProcessEvent( event );
-
-    return event.MoreRequested();
-}
-
-void wxApp::OnIdle( wxIdleEvent &event )
-{
-    static bool s_inOnIdle = FALSE;
-
-    // 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);
-
-    s_inOnIdle = FALSE;
-}
-
-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
-
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->GetNext();
-    }
-
-    return needMore;
-}
-
-bool wxApp::CallInternalIdle( wxWindow* win )
-{
-    win->OnInternalIdle();
-
-    wxWindowList::Node  *node = win->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow    *win = node->GetData();
-
-        CallInternalIdle( win );
-        node = node->GetNext();
-    }
-
-    return TRUE;
-}
-
-bool wxApp::SendIdleEvents( wxWindow* win )
-{
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-
-    win->GetEventHandler()->ProcessEvent(event);
-
-    if (event.MoreRequested())
-        needMore = TRUE;
-
-    wxWindowList::Node  *node = win->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow    *win = node->GetData();
-
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
-    }
-
-    return needMore;
-}
-
-int wxApp::MainLoop()
-{
-    gtk_main();
-    return 0;
-}
-
-void wxApp::Exit()
-{
-    // VZ: no idea why is it different from ExitMainLoop() but this is what
-    //     wxExit() used to do
-    gtk_main_quit();
-}
-
-void wxApp::ExitMainLoop()
-{
-    if (gtk_main_level() > 0)
-        gtk_main_quit();
-}
-
-bool wxApp::Initialized()
-{
-    return m_initialized;
-}
-
-bool wxApp::Pending()
-{
-    return (gtk_events_pending() > 0);
-}
-
-void wxApp::Dispatch()
-{
-    gtk_main_iteration();
-}
-

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

+    bool init_result;
+

 #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))
     {
 #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))
     {

-        printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );

     }
     else
     {
     }
     else
     {

-        g_thread_init(NULL);
+        if (!g_thread_supported())
+            g_thread_init(NULL);

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


@@ -691,13 +584,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // We should have the wxUSE_WCHAR_T test on the _outside_
 #if wxUSE_WCHAR_T
 
     // We should have the wxUSE_WCHAR_T test on the _outside_
 #if wxUSE_WCHAR_T

-    #if defined(__WXGTK20__)
-        // gtk+ 2.0 supports Unicode through UTF-8 strings
-        wxConvCurrent = &wxConvUTF8;
-    #else // GTK 1.x

         if (!wxOKlibc())
             wxConvCurrent = &wxConvLocal;
         if (!wxOKlibc())
             wxConvCurrent = &wxConvLocal;

-    #endif

 #else // !wxUSE_WCHAR_T
     if (!wxOKlibc())
         wxConvCurrent = (wxMBConv*) NULL;
 #else // !wxUSE_WCHAR_T
     if (!wxOKlibc())
         wxConvCurrent = (wxMBConv*) NULL;


@@ -706,7 +594,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
     int i;
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
     int i;

-    char *argvGTK = new char *[argc + 1];
+    char **argvGTK = new char *[argc + 1];

     for ( i = 0; i < argc; i++ )
     {
         argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
     for ( i = 0; i < argc; i++ )
     {
         argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));


@@ -715,14 +603,20 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;

-    gtk_init( &argcGTK, &argvGTK );
+
+#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

 
     if ( argcGTK != argc )
     {
         // we have to drop the parameters which were consumed by GTK+
         for ( i = 0; i < argcGTK; i++ )
         {
 
     if ( argcGTK != argc )
     {
         // we have to drop the parameters which were consumed by GTK+
         for ( i = 0; i < argcGTK; i++ )
         {

-            while ( wxStrcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
+            while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )

             {
                 memmove(argv + i, argv + i + 1, argc - i);
             }
             {
                 memmove(argv + i, argv + i + 1, argc - i);
             }


@@ -742,9 +636,14 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else // !wxUSE_UNICODE
     // gtk_init() shouldn't actually change argv itself (just its contents) so
     // it's ok to pass pointer to it
 #else // !wxUSE_UNICODE
     // gtk_init() shouldn't actually change argv itself (just its contents) so
     // it's ok to pass pointer to it

-    gtk_init( &argc, &argv );
+    init_result = gtk_init_check( &argc, &argv );

 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 

+    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();
 
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();
 


@@ -761,8 +660,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

-    wxGetRootWindow();
-

     return true;
 }
 
     return true;
 }
 


@@ -777,12 +674,24 @@ void wxApp::CleanUp()
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {

-    m_isInAssert = TRUE;
+    m_isInAssert = true;

 
     wxAppBase::OnAssert(file, line, cond, msg);
 
 
     wxAppBase::OnAssert(file, line, cond, msg);
 

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 
 #endif // __WXDEBUG__
 
 }
 
 #endif // __WXDEBUG__
 

+void wxApp::RemoveIdleTag()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+    if (!g_isIdle)
+    {
+        gtk_idle_remove( wxTheApp->m_idleTag );
+        wxTheApp->m_idleTag = 0;
+        g_isIdle = true;
+    }
+}