X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..f5bed7a885024108682c32c74567cdf7bf2ed13b:/src/gtk/app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 501e625977..c9f6bbc827 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -1,425 +1,641 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.cpp
+// Name:        src/gtk/app.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "app.h"
+#ifdef __VMS
+// vms_jackets.h should for proper working be included before anything else
+# include <vms_jackets.h>
+#undef ConnectionNumber
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/postscrp.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/memory.h"
-#include "wx/font.h"
-#include "wx/settings.h"
-#include "wx/resource.h"
-
-#include "unistd.h"
-
-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.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"
+#endif
+
+#include "wx/file.h"
+#include "wx/filename.h"
+#include "wx/module.h"
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+    #include <gpe/init.h>
+#endif
+
+#ifdef __WXUNIVERSAL__
+    #include "wx/univ/theme.h"
+    #include "wx/univ/renderer.h"
+#endif
+
+#include <unistd.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>
+#endif // HAVE_POLL/!HAVE_POLL
+
+#include "wx/unix/private.h"
+#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
+
+#include <gdk/gdkx.h>
+
+//-----------------------------------------------------------------------------
+// link GnomeVFS
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBGNOMEVFS
+#include "wx/html/forcelnk.h"
+FORCE_LINK(gnome_vfs)
 #endif
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-wxApp *wxTheApp = (wxApp *)  NULL;
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+bool   g_mainThreadLocked = false;
+gint   g_pendingTag = 0;
 
-extern wxList wxPendingDelete;
-extern wxResourceCache *wxTheResourceCache;
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 
 //-----------------------------------------------------------------------------
-// local functions
+// idle system
 //-----------------------------------------------------------------------------
 
-extern void wxFlushResources(void);
+void wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+static wxMutex gs_idleTagsMutex;
+#endif
 
 //-----------------------------------------------------------------------------
-// global functions
+// wxYield
 //-----------------------------------------------------------------------------
 
-void wxExit(void)
-{
-  gtk_main_quit();
-}
+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = false;
 
-bool wxYield(void)
+bool wxApp::Yield(bool onlyIfNeeded)
 {
-  while (gtk_events_pending() > 0) gtk_main_iteration();
-  return TRUE;
-}
+    if ( wxIsInsideYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
 
-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
+        return false;
+    }
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return true;
+    }
+#endif // wxUSE_THREADS
 
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+    wxIsInsideYield = true;
 
-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
-{
-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
-  usleep( 10000 );
-  return TRUE;
-}
+    // We need to remove idle callbacks or the loop will
+    // never finish.
+    wxTheApp->RemoveIdleTag();
 
-wxApp::wxApp()
-{
-  m_idleTag = 0;
-  m_topWindow = (wxWindow *) NULL;
-  m_exitOnFrameDelete = TRUE;
-  wxTheApp = this;
-}
+#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
 
-wxApp::~wxApp(void)
-{
-  gtk_idle_remove( m_idleTag );
-}
+    while (gtk_events_pending())
+        gtk_main_iteration();
 
-bool wxApp::OnInit(void)
-{
-  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();
 
-bool wxApp::OnInitGui(void)
-{
-  m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
-  return TRUE;
-}
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif
 
-int wxApp::OnRun(void)
-{
-  return MainLoop();
+    wxIsInsideYield = false;
+
+    return true;
 }
 
-bool wxApp::ProcessIdle(void)
-{
-  wxIdleEvent event;
-  event.SetEventObject( this );
-  ProcessEvent( event );
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+// RR/KH: No wxMutexGui calls are needed here according to the GTK faq,
+// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent.
 
-  return event.MoreRequested();
+void wxApp::WakeUpIdle()
+{
+    wxapp_install_idle_handler();
 }
 
-void wxApp::OnIdle( wxIdleEvent &event )
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------
+
+// the callback functions must be extern "C" to comply with GTK+ declarations
+extern "C"
 {
-  static bool inOnIdle = FALSE;
 
-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+{
+    if (!wxTheApp) return TRUE;
 
-  inOnIdle = 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();
 
-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    // Sent idle event to all who request them.
+    wxTheApp->ProcessPendingEvents();
 
-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        g_pendingTag = 0;
+    }
 
-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+    // Flush the logged messages if any.
+#if wxUSE_LOG
+    wxLog::FlushActive();
+#endif // wxUSE_LOG
 
-  if (needMore)
-    event.RequestMore(TRUE);
+    // Release lock again
+    gdk_threads_leave();
 
-  inOnIdle = FALSE;
+    // Return FALSE to indicate that no more idle events are
+    // to be sent (single shot instead of continuous stream)
+    return FALSE;
 }
 
-bool wxApp::SendIdleEvents(void)
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
-    bool needMore = FALSE;
-	wxNode* node = wxTopLevelWindows.First();
-	while (node)
-	{
-		wxWindow* win = (wxWindow*) node->Data();
-		if (SendIdleEvents(win))
-            needMore = TRUE;
-
-		node = node->Next();
-	}
-    return needMore;
-}
+    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(wxMessageDialog)))
+                win->OnInternalIdle();
+        }
+        return TRUE;
+    }
+#endif // __WXDEBUG__
 
-bool wxApp::SendIdleEvents( wxWindow* win )
-{
-    bool needMore = FALSE;
+    // 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();
 
-	wxIdleEvent event;
-	event.SetEventObject(win);
-	win->ProcessEvent(event);
+    // 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;
+    }
 
-    if (event.MoreRequested())
-        needMore = TRUE;
+    bool moreIdles;
 
-	wxNode* node = win->GetChildren()->First();
-	while (node)
-	{
-		wxWindow* win = (wxWindow*) node->Data();
-		if (SendIdleEvents(win))
-            needMore = TRUE;
+    // Send idle event to all who request them as long as
+    // no events have popped up in the event queue.
+    while ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0)
+        ;
 
-		node = node->Next();
-	}
-    return needMore ;
-}
+    // Release lock again
+    gdk_threads_leave();
 
-int wxApp::OnExit(void)
-{
-  return 0;
+    // Return FALSE if no more idle events are to be sent
+    return moreIdles;
 }
 
-int wxApp::MainLoop(void)
-{
-  gtk_main();
-  return 0;
-}
+#if wxUSE_THREADS
 
-void wxApp::ExitMainLoop(void)
-{
-  gtk_main_quit();
-}
+#ifdef HAVE_POLL
+    #define wxPoll poll
+    #define wxPollFd pollfd
+#else // !HAVE_POLL
 
-bool wxApp::Initialized(void)
-{
-  return m_initialized;
-}
+typedef GPollFD wxPollFd;
 
-bool wxApp::Pending(void)
+int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
 {
-  return FALSE;
-}
+    // 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") );
 
-void wxApp::Dispatch(void)
-{
-}
+        if ( ufds[i].events & G_IO_IN )
+            wxFD_SET(ufds[i].fd, &readfds);
 
-void wxApp::DeletePendingObjects(void)
-{
-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
+        if ( ufds[i].events & G_IO_PRI )
+            wxFD_SET(ufds[i].fd, &exceptfds);
 
-    delete obj;
+        if ( ufds[i].events & G_IO_OUT )
+            wxFD_SET(ufds[i].fd, &writefds);
 
-    if (wxPendingDelete.Member(obj))
-      delete node;
+        if ( ufds[i].fd > fdMax )
+            fdMax = ufds[i].fd;
+    }
 
-    node = wxPendingDelete.First();
-  }
-}
+    fdMax++;
+    int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
 
-wxWindow *wxApp::GetTopWindow(void)
-{
-  if (m_topWindow) return m_topWindow;
-  wxNode *node = wxTopLevelWindows.First();
-  if (!node) return (wxWindow *) NULL;
-  return (wxWindow*)node->Data();
-}
+    // translate the results back
+    for ( i = 0; i < nfds; i++ )
+    {
+        ufds[i].revents = 0;
 
-void wxApp::SetTopWindow( wxWindow *win )
-{
-  m_topWindow = win;
-}
+        if ( wxFD_ISSET(ufds[i].fd, &readfds ) )
+            ufds[i].revents |= G_IO_IN;
 
-void wxApp::CommonInit(void)
-{
+        if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
+            ufds[i].revents |= G_IO_PRI;
 
-/*
-#if wxUSE_RESOURCES
-  (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
-*/
-  wxSystemSettings::Init();
-  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
+        if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
+            ufds[i].revents |= G_IO_OUT;
+    }
 
-  wxTheFontNameDirectory =  new wxFontNameDirectory;
-  wxTheFontNameDirectory->Initialize();
+    return res;
+}
 
-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+#endif // HAVE_POLL/!HAVE_POLL
 
-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
+{
+    gdk_threads_enter();
 
-  wxInitializeResourceSystem();
+    wxMutexGuiLeave();
+    g_mainThreadLocked = true;
 
-  // For PostScript printing
-#if wxUSE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
-#endif
+    // 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;
 
-/*
-  wxBitmap::InitStandardHandlers();
+    gdk_threads_leave();
 
-  g_globalCursor = new wxCursor;
-*/
+    return res;
 }
 
-void wxApp::CommonCleanUp(void)
+#endif // wxUSE_THREADS
+
+} // extern "C"
+
+void wxapp_install_idle_handler()
 {
-  wxDELETE(wxTheColourDatabase);
-  wxDELETE(wxThePrintPaperDatabase);
-  wxDELETE(wxThePrintSetupData);
-  wxDELETE(wxTheFontNameDirectory);
-  wxDeleteStockObjects();
+#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;
 
-  wxFlushResources();
+    // 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)") );
 
-  wxDELETE(wxTheResourceCache);
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
-  wxDeleteStockLists();
+    g_isIdle = false;
 
-  wxCleanUpResourceSystem();
+    if (g_pendingTag == 0)
+        g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL );
 
-  wxSystemSettings::Done();
+    // 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( 1000, wxapp_idle_callback, NULL, NULL );
 }
 
-wxLog *wxApp::CreateLogTarget()
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
 {
-  return new wxLogGui;
+    if (gs_RootWindow == NULL)
+    {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;
 }
 
 //-----------------------------------------------------------------------------
-// wxEntry
+// wxApp
 //-----------------------------------------------------------------------------
 
-int wxEntry( int argc, char *argv[] )
-{
-  wxBuffer = new char[BUFSIZ + 512];
+IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
-  wxClassInfo::InitializeClasses();
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxAppBase::OnIdle)
+END_EVENT_TABLE()
 
-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+wxApp::wxApp()
+{
+#ifdef __WXDEBUG__
+    m_isInAssert = false;
+#endif // __WXDEBUG__
 
-  streambuf* sBuf = new wxDebugStreamBuf;
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
+    m_idleTag = 0;
+    g_isIdle = true;
+    wxapp_install_idle_handler();
 
+#if wxUSE_THREADS
+    g_main_context_set_poll_func( NULL, wxapp_poll_func );
 #endif
 
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
-    {
-      printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-      return 0;
-    }
+    // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
+    m_glVisualInfo = (void *) NULL;
+    m_glFBCInfo = (void *) NULL;
+}
 
-    wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
+wxApp::~wxApp()
+{
+    if (m_idleTag)
+        g_source_remove( m_idleTag );
+}
 
-    wxObject *test_app = app_ini();
+bool wxApp::OnInitGui()
+{
+    if ( !wxAppBase::OnInitGui() )
+        return false;
 
-    wxTheApp = (wxApp*) test_app;
-  }
+    // 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)
+    {
+        // seems gtk_widget_set_default_visual no longer exists?
+        GdkVisual* vis = gtk_widget_get_default_visual();
 
-  if (!wxTheApp)
-  {
-    printf( "wxWindows error: wxTheApp == NULL\n" );
-    return 0;
-  }
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+    }
 
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
+    // On some machines, the default visual is just 256 colours, so
+    // we make sure we get the best. This can sometimes be wasteful.
 
-  char name[200];
-  strcpy( name, argv[0] );
-  strcpy( name, wxFileNameFromPath(name) );
-  wxStripExtension( name );
-  wxTheApp->SetAppName( name );
-  
-  gtk_set_locale();
-  
-  gtk_init( &argc, &argv );
+    else
+    if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
+    {
+        /* seems gtk_widget_set_default_visual no longer exists? */
+        GdkVisual* vis = gtk_widget_get_default_visual();
 
-#ifdef wxUSE_GDK_IMLIB
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+    }
 
-  gdk_imlib_init();
+    return true;
+}
 
-  gtk_widget_push_visual(gdk_imlib_get_visual());
+GdkVisual *wxApp::GetGdkVisual()
+{
+    GdkVisual *visual = NULL;
 
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
+    if (m_glVisualInfo)
+        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+    else
+        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
 
-#endif
+    wxASSERT( visual );
 
-  wxApp::CommonInit();
+    return visual;
+}
 
-  wxTheApp->OnInitGui();
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+    bool init_result;
+
+#if wxUSE_THREADS
+    if (!g_thread_supported())
+        g_thread_init(NULL);
+#endif // wxUSE_THREADS
+
+    gtk_set_locale();
+
+    // 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 == _T("@locale"))
+        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");
+#endif // wxUSE_INTL
+    static wxConvBrokenFileNames fileconv(encName);
+    wxConvFileName = &fileconv;
+
+#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]));
+    }
 
-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
+    argvGTK[argc] = NULL;
 
-  if (!wxTheApp->OnInit()) return 0;
+    int argcGTK = argc;
 
-  wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+#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
 
-  int retValue = 0;
+    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);
+            }
+        }
+
+        argc = argcGTK;
+    }
+    //else: gtk_init() didn't modify our parameters
 
-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+    // free our copy
+    for ( i = 0; i < argcGTK; i++ )
+    {
+        free(argvGTK[i]);
+    }
 
-  wxTheApp->DeletePendingObjects();
+    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
 
-  wxTheApp->OnExit();
+    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();
 
-  wxApp::CommonCleanUp();
+    if ( !wxAppBase::Initialize(argc, argv) )
+    {
+        gdk_threads_leave();
+
+        return false;
+    }
 
-  wxDELETE(wxTheApp);
+    wxSetDetectableAutoRepeat( true );
 
-  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
-  if (oldLog) delete oldLog;
-  
-  wxClassInfo::CleanUpClasses();
-  
-  delete[] wxBuffer;
-  
-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-  
-  if (wxDebugContext::CountObjectsLeft() > 0)
-  {
-    wxTrace("There were memory leaks.\n");
-    wxDebugContext::Dump();
-    wxDebugContext::PrintStatistics();
-  }
-  wxDebugContext::SetStream(NULL, NULL);
-  
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
-  return retValue;
+    return true;
 }
 
-//-----------------------------------------------------------------------------
-// main()
-//-----------------------------------------------------------------------------
+void wxApp::CleanUp()
+{
+    gdk_threads_leave();
 
-#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
+    wxAppBase::CleanUp();
+}
 
- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
+#ifdef __WXDEBUG__
 
-#else
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
+{
+    m_isInAssert = true;
 
-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+    wxAppBase::OnAssert(file, line, cond, msg);
 
-#endif
+    m_isInAssert = false;
+}
 
+#endif // __WXDEBUG__
 
+void wxApp::RemoveIdleTag()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+    if (!g_isIdle)
+    {
+        g_source_remove( wxTheApp->m_idleTag );
+        wxTheApp->m_idleTag = 0;
+        g_isIdle = true;
+    }
+}