streamlining slider, scroller, spinbutton for osx carbon and cocoa

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 877850f5fb307f64991638f6cc465740da72948a..e982ec4ab0bf41859b2493ed984aeb363589e09b 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -1,415 +1,587 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

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

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

-#ifdef __GNUG__
-#pragma implementation "app.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

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

-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/postscrp.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/memory.h"
-#include "wx/font.h"
-#include "wx/settings.h"
-#include "wx/resource.h"
-
-#include "unistd.h"
-
-#ifdef USE_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/memory.h"
+    #include "wx/font.h"
+#endif
+
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+    #include <gpe/init.h>

 #endif
 
 #endif
 

+#include "wx/gtk/private.h"
+#include "wx/apptrait.h"
+
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-program.h>
+#endif // wxUSE_LIBHILDON
+
+#include <gdk/gdkx.h>
+

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

-// global data
+// link GnomeVFS

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

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

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

-// local functions
+// global data

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

-extern void wxFlushResources(void);
+static GtkWidget *gs_RootWindow = NULL;

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

-// global functions
+// wxYield

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

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

 {
 {

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

 
 

-bool wxYield(void)
-{
-  while (gtk_events_pending() > 0) gtk_main_iteration();
-  return TRUE;
-}
+        return false;
+    }

 
 

-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return true;
+    }
+#endif // wxUSE_THREADS

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+    m_isInsideYield = true;

 
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+#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

 
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
-{
-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
-  usleep( 10000 );
-  return TRUE;
-}
+    while (EventsPending())
+        gtk_main_iteration();

 
 

-wxApp::wxApp()
-{
-  m_idleTag = 0;
-  m_topWindow = NULL;
-  m_exitOnFrameDelete = 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();

 
 

-wxApp::~wxApp(void)
-{
-  gtk_idle_remove( m_idleTag );
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif
+
+    m_isInsideYield = false;
+
+    return true;

 }
 
 }
 

-bool wxApp::OnInit(void)
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------
+
+// One-shot signal emission hook, to install idle handler.
+extern "C" {
+static gboolean
+wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)

 {
 {

-  return TRUE;
+    wxApp* app = wxTheApp;
+    if (app != NULL)
+        app->WakeUpIdle();
+    gulong* hook_id = (gulong*)data;
+    // record that hook is not installed
+    *hook_id = 0;
+    // remove hook
+    return false;

 }
 }

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

 }
 
 }
 

-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
+// Add signal emission hooks, to re-install idle handler when needed.
+static void wx_add_idle_hooks()
+{
+    // "event" hook
+    {
+        static gulong hook_id = 0;
+        if (hook_id == 0)
+        {
+            static guint sig_id = 0;
+            if (sig_id == 0)
+                sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
+            hook_id = g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_id, NULL);
+        }
+    }
+    // "size_allocate" hook
+    // Needed to match the behavior of the old idle system,
+    // but probably not necessary.
+    {
+        static gulong hook_id = 0;
+        if (hook_id == 0)
+        {
+            static guint sig_id = 0;
+            if (sig_id == 0)
+                sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET);
+            hook_id = g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_id, NULL);
+        }
+    }

 }
 
 }
 

-bool wxApp::ProcessIdle(void)
+extern "C" {
+static gboolean wxapp_idle_callback(gpointer)

 {
 {

-  wxIdleEvent event;
-  event.SetEventObject( this );
-  ProcessEvent( event );
-  
-  return event.MoreRequested();
+    return wxTheApp->DoIdle();
+}

 }
 
 }
 

-void wxApp::OnIdle( wxIdleEvent &event )
+bool wxApp::DoIdle()

 {
 {

-  static bool inOnIdle = FALSE;
-
-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+    guint id_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(*m_idleMutex);
+#endif
+        id_save = m_idleSourceId;
+        m_idleSourceId = 0;
+        wx_add_idle_hooks();
+#ifdef __WXDEBUG__
+        // don't generate the idle events while the assert modal dialog is shown,
+        // this matches the behavior of wxMSW
+        if (m_isInAssert)
+            return false;
+#endif
+    }

 
 

-  inOnIdle = TRUE;
+    gdk_threads_enter();
+    bool needMore;
+    do {
+        needMore = ProcessIdle();
+    } while (needMore && gtk_events_pending() == 0);
+    gdk_threads_leave();

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+#if wxUSE_THREADS
+    wxMutexLocker lock(*m_idleMutex);
+#endif
+    // if a new idle source was added during ProcessIdle
+    if (m_idleSourceId != 0)
+    {
+        // remove it
+        g_source_remove(m_idleSourceId);
+        m_idleSourceId = 0;
+    }

 
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    // Pending events can be added asynchronously,
+    // need to keep idle source if any have appeared
+    needMore = needMore || HasPendingEvents();

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+    // if more idle processing requested
+    if (needMore)
+    {
+        // keep this source installed
+        m_idleSourceId = id_save;
+        return true;
+    }
+    // add hooks and remove this source
+    wx_add_idle_hooks();
+    return false;
+}

 
 

-  if (needMore)
-    event.RequestMore(TRUE);
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------

 
 

-  inOnIdle = FALSE;
+GtkWidget* wxGetRootWindow()
+{
+    if (gs_RootWindow == NULL)
+    {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;

 }
 
 }
 

-bool wxApp::SendIdleEvents(void)
+//-----------------------------------------------------------------------------
+// wxApp
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+
+wxApp::wxApp()

 {
 {

-    bool needMore = FALSE;
-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
-
-               node = node->Next();
-       }
-    return needMore;
+#ifdef __WXDEBUG__
+    m_isInAssert = false;
+#endif // __WXDEBUG__
+#if wxUSE_THREADS
+    m_idleMutex = NULL;
+#endif
+    m_idleSourceId = 0;

 }
 
 }
 

-bool wxApp::SendIdleEvents( wxWindow* win )
+wxApp::~wxApp()

 {
 {

-    bool needMore = FALSE;
+}

 
 

-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+bool wxApp::SetNativeTheme(const wxString& theme)
+{
+    wxString path;
+    path = gtk_rc_get_theme_dir();
+    path += "/";
+    path += theme.utf8_str();
+    path += "/gtk-2.0/gtkrc";
+
+    if ( wxFileExists(path.utf8_str()) )
+        gtk_rc_add_default_file(path.utf8_str());
+    else if ( wxFileExists(theme.utf8_str()) )
+        gtk_rc_add_default_file(theme.utf8_str());
+    else
+    {
+        wxLogWarning("Theme \"%s\" not available.", theme);

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+        return false;
+    }

 
 

-       wxNode* node = win->GetChildren()->First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
+    gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE);

 
 

-               node = node->Next();
-       }
-    return needMore ;
+    return true;

 }
 
 }
 

-int wxApp::OnExit(void)
+bool wxApp::OnInitGui()

 {
 {

-  return 0;
-}
+    if ( !wxAppBase::OnInitGui() )
+        return false;

 
 

-int wxApp::MainLoop(void)
-{
-  gtk_main();
-  return 0;
-}
+    // if this is a wxGLApp (derived from wxApp), and we've already
+    // chosen a specific visual, then derive the GdkVisual from that
+    if ( GetXVisualInfo() )
+    {
+        GdkVisual* vis = gtk_widget_get_default_visual();

 
 

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

 
 

-bool wxApp::Initialized(void)
-{
-  return m_initialized;
-}
+#if wxUSE_LIBHILDON
+    m_hildonProgram = hildon_program_get_instance();
+    if ( !m_hildonProgram )
+    {
+        wxLogError(_("Unable to initialize Hildon program"));
+        return false;
+    }
+#endif // wxUSE_LIBHILDON

 
 

-bool wxApp::Pending(void) 
-{
-  return FALSE;
+    return true;

 }
 
 }
 

-void wxApp::Dispatch(void) 
+GdkVisual *wxApp::GetGdkVisual()

 {
 {

-}
+    GdkVisual *visual = NULL;

 
 

-void wxApp::DeletePendingObjects(void)
-{
-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    
-    delete obj;
-
-    if (wxPendingDelete.Member(obj))
-      delete node;
-
-    node = wxPendingDelete.First();
-  }
-}
+    XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo();
+    if ( xvi )
+        visual = gdkx_visual_get( xvi->visualid );
+    else
+        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );

 
 

-wxWindow *wxApp::GetTopWindow(void)
-{
-  if (m_topWindow) return m_topWindow;
-  wxNode *node = wxTopLevelWindows.First();
-  if (!node) return NULL;
-  return (wxWindow*)node->Data();
-}
+    wxASSERT( visual );

 
 

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

 }
 
 }
 

-void wxApp::CommonInit(void)
+// use unusual names for the parameters to avoid conflict with wxApp::arg[cv]
+bool wxApp::Initialize(int& argc_, wxChar **argv_)

 {
 {

+    if ( !wxAppBase::Initialize(argc_, argv_) )
+        return false;

 
 

-/*
-#if USE_RESOURCES
-  (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
-*/
-  wxSystemSettings::Init();
-  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
-
-  wxTheFontNameDirectory =  new wxFontNameDirectory;
-  wxTheFontNameDirectory->Initialize();
-
-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
-
-  wxInitializeStockLists();
-  wxInitializeStockObjects();
-
-  wxInitializeResourceSystem();
-  
-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
+#if wxUSE_THREADS
+    if (!g_thread_supported())
+    {
+        g_thread_init(NULL);
+        gdk_threads_init();
+    }
+#endif // wxUSE_THREADS
+
+    // gtk+ 2.0 supports Unicode through UTF-8 strings
+    wxConvCurrent = &wxConvUTF8;
+
+    // decide which conversion to use for the file names
+
+    // (1) this variable exists for the sole purpose of specifying the encoding
+    //     of the filenames for GTK+ programs, so use it if it is set
+    wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
+    encName = encName.BeforeFirst(_T(','));
+    if (encName.CmpNoCase(_T("@locale")) == 0)
+        encName.clear();
+    encName.MakeUpper();
+#if wxUSE_INTL
+    if (encName.empty())
+    {
+        // (2) if a non default locale is set, assume that the user wants his
+        //     filenames in this locale too
+        encName = wxLocale::GetSystemEncodingName().Upper();
+        // (3) finally use UTF-8 by default
+        if (encName.empty() || encName == _T("US-ASCII"))
+            encName = _T("UTF-8");
+        wxSetEnv(_T("G_FILENAME_ENCODING"), encName);
+    }
+#else
+    if (encName.empty())
+        encName = _T("UTF-8");
+
+    // if 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();
+
+#endif // wxUSE_INTL
+    static wxConvBrokenFileNames fileconv(encName);
+    wxConvFileName = &fileconv;
+
+
+    bool init_result;
+    int i;
+
+#if wxUSE_UNICODE
+    // gtk_init() wants UTF-8, not wchar_t, so convert
+    char **argvGTK = new char *[argc_ + 1];
+    for ( i = 0; i < argc_; i++ )
+    {
+        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i]));
+    }
+
+    argvGTK[argc_] = NULL;
+
+    int argcGTK = argc_;
+
+#ifdef __WXGPE__
+    init_result = true;  // is there a _check() version of this?
+    gpe_application_init( &argcGTK, &argvGTK );
+#else
+    init_result = gtk_init_check( &argcGTK, &argvGTK );

 #endif
 #endif

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

 
 

+    // free our copy
+    for ( i = 0; i < argcGTK; i++ )
+    {
+        free(argvGTK[i]);
+    }

 
 

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

 
 

-  g_globalCursor = new wxCursor;
-*/
-}
+    // update internal arg[cv] as GTK+ may have removed processed options:
+    this->argc = argc_;
+    this->argv = argv_;

 
 

-void wxApp::CommonCleanUp(void)
-{
-  wxDELETE(wxTheColourDatabase);
-  wxDELETE(wxThePrintPaperDatabase);
-  wxDELETE(wxThePrintSetupData);
-  wxDELETE(wxTheFontNameDirectory);
-  wxDeleteStockObjects();
-  
-  wxFlushResources();
+    if ( m_traits )
+    {
+        // if there are still GTK+ standard options unparsed in the command
+        // line, it means that they were not syntactically correct and GTK+
+        // already printed a warning on the command line and we should now
+        // exit:
+        wxArrayString opt, desc;
+        m_traits->GetStandardCmdLineOptions(opt, desc);
+
+        for ( i = 0; i < argc_; i++ )
+        {
+            // leave just the names of the options with values
+            const wxString str = wxString(argv_[i]).BeforeFirst('=');
+
+            for ( size_t j = 0; j < opt.size(); j++ )
+            {
+                // remove the leading spaces from the option string as it does
+                // have them
+                if ( opt[j].Trim(false).BeforeFirst('=') == str )
+                {
+                    // a GTK+ option can be left on the command line only if
+                    // there was an error in (or before, in another standard
+                    // options) it, so abort, just as we do if incorrect
+                    // program option is given
+                    wxLogError(_("Invalid GTK+ command line option, use \"%s --help\""),
+                               argv_[0]);
+                    return false;
+                }
+            }
+        }
+    }
+
+    if ( !init_result )
+    {
+        wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?"));
+        return false;
+    }

 
 

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

 
 

-  wxDeleteStockLists();
+    wxSetDetectableAutoRepeat( true );

 
 

-  wxCleanUpResourceSystem();
-  
-  wxSystemSettings::Done();
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+
+#if wxUSE_THREADS
+    m_idleMutex = new wxMutex;
+#endif
+    // make sure GtkWidget type is loaded, idle hooks need it
+    g_type_class_ref(GTK_TYPE_WIDGET);
+    WakeUpIdle();
+
+    return true;

 }
 }

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

 {
 {

-  return new wxLogGui;
-}
+    if (m_idleSourceId != 0)
+        g_source_remove(m_idleSourceId);

 
 

-//-----------------------------------------------------------------------------
-// wxEntry
-//-----------------------------------------------------------------------------
+    // release reference acquired by Initialize()
+    g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET));

 
 

-int wxEntry( int argc, char *argv[] )
-{
-  wxBuffer = new char[BUFSIZ + 512];
+    gdk_threads_leave();

 
 

-  wxClassInfo::InitializeClasses();
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+    wxAppBase::CleanUp();

 
 

-#if !defined(_WINDLL)
-  streambuf* sBuf = new wxDebugStreamBuf;
-#else
-  streambuf* sBuf = NULL;
+    // delete this mutex as late as possible as it's used from WakeUpIdle(), in
+    // particular do it after calling the base class CleanUp() which can result
+    // in it being called
+#if wxUSE_THREADS
+    delete m_idleMutex;
+    m_idleMutex = NULL;

 #endif
 #endif

-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
+}

 
 

+void wxApp::WakeUpIdle()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(*m_idleMutex);

 #endif
 #endif

-  
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
+    if (m_idleSourceId == 0)
+        m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
+}
+
+// Checking for pending events requires first removing our idle source,
+// otherwise it will cause the check to always return true.
+bool wxApp::EventsPending()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(*m_idleMutex);
+#endif
+    if (m_idleSourceId != 0)

     {
     {

-      printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
-      return 0;
+        g_source_remove(m_idleSourceId);
+        m_idleSourceId = 0;
+        wx_add_idle_hooks();

     }
     }

-    
-    wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
-    
-    wxObject *test_app = app_ini();
-    
-    wxTheApp = (wxApp*) test_app;
-  }
-  
-  if (!wxTheApp) 
-  {
-    printf( _("wxWindows error: wxTheApp == NULL\n") );
-    return 0;
-  }
-
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
-  
-  gtk_init( &argc, &argv );
-
-#ifdef USE_GDK_IMLIB
-
-  gdk_imlib_init();
-  
-  gtk_widget_push_visual(gdk_imlib_get_visual());
-  
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
-  
-#endif  
-    
-  wxApp::CommonInit();
-
-  wxTheApp->OnInitGui();
-
-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
-  
-  if (!wxTheApp->OnInit()) return 0;
-
-  wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-  
-  int retValue = 0;
-  
-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-  
-  wxTheApp->DeletePendingObjects();  
-  
-  wxTheApp->OnExit();
-  
-  wxApp::CommonCleanUp();
-
-  wxDELETE(wxTheApp);
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
-  // At this point we want to check if there are any memory
-  // blocks that aren't part of the wxDebugContext itself,
-  // as a special case. Then when dumping we need to ignore
-  // wxDebugContext, too.
-  if (wxDebugContext::CountObjectsLeft() > 0)
-  {
-    wxTrace("There were memory leaks.\n");
-    wxDebugContext::Dump();
-    wxDebugContext::PrintStatistics();
-  }
-  wxDebugContext::SetStream(NULL, NULL);
-#endif
-  
-  return retValue;
+    return gtk_events_pending() != 0;

 }
 
 }
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-#endif
+#endif // __WXDEBUG__

 
 

+#if wxUSE_THREADS
+void wxGUIAppTraits::MutexGuiEnter()
+{
+    gdk_threads_enter();
+}

 
 

+void wxGUIAppTraits::MutexGuiLeave()
+{
+    gdk_threads_leave();
+}
+#endif // wxUSE_THREADS