Fix line indices translation in wxGrid::DoEndDragResizeLine().

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 780924b4ebf3bc921b491fafe6a0a90079a030de..72dd08db41d27c55bb9339dc7d4e9e399fea6404 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,8 +26,16 @@
     #include <gpe/init.h>
 #endif
 
     #include <gpe/init.h>
 #endif
 

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

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

+#include "wx/apptrait.h"
+
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-program.h>
+#endif // wxUSE_LIBHILDON
+
+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2

 
 #include <gdk/gdkx.h>
 
 
 #include <gdk/gdkx.h>
 


@@ -46,254 +48,123 @@
     wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 
     wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-bool   g_mainThreadLocked = false;
-
-static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-void wxapp_install_idle_handler();
-
-#if wxUSE_THREADS
-static wxMutex gs_idleTagsMutex;
-#endif
-
-//-----------------------------------------------------------------------------
-// wxYield
-//-----------------------------------------------------------------------------
-
-// not static because used by textctrl.cpp
-//
-// MT-FIXME
-bool wxIsInsideYield = false;
-
-bool wxApp::Yield(bool onlyIfNeeded)
-{
-    if ( wxIsInsideYield )
-    {
-        if ( !onlyIfNeeded )
-        {
-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
-
-        return false;
-    }
-
-#if wxUSE_THREADS
-    if ( !wxThread::IsMain() )
-    {
-        // 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.
-    SuspendIdleCallback();
-
-#if wxUSE_LOG
-    // disable log flushing from here because a call to wxYield() shouldn't
-    // normally result in message boxes popping up &c
-    wxLog::Suspend();
-#endif
-
-    while (gtk_events_pending())
-        gtk_main_iteration();
-
-    // It's necessary to call ProcessIdle() to update the frames sizes which
-    // might have been changed (it also will update other things set from
-    // OnUpdateUI() which is a nice (and desired) side effect). But we
-    // call ProcessIdle() only once since this is not meant for longish
-    // background jobs (controlled by wxIdleEvent::RequestMore() and the
-    // return value of Processidle().
-    ProcessIdle();
-
-#if wxUSE_LOG
-    // let the logs be flashed again
-    wxLog::Resume();
-#endif
-
-    wxIsInsideYield = false;
-
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// 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.
-
-void wxApp::WakeUpIdle()
-{
-    wxapp_install_idle_handler();
-}
-

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

-// the callback functions must be extern "C" to comply with GTK+ declarations
-extern "C"
-{
-
-// One-shot emission hook for "event" signal, to install idle handler.
-// This will be called when the "event" signal is issued on any GtkWidget object.
+// One-shot signal emission hook, to install idle handler.
+extern "C" {

 static gboolean
 static gboolean

-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)

 {
 {

-    wxapp_install_idle_handler();
+    wxApp* app = wxTheApp;
+    if (app != NULL)
+        app->WakeUpIdle();
+    bool* hook_installed = (bool*)data;
+    // record that hook is not installed
+    *hook_installed = false;

     // remove hook
     return false;
 }
     // remove hook
     return false;
 }

-
-// add emission hook for "event" signal, to re-install idle handler when needed
-static inline void wxAddEmissionHook()
-{
-    GType widgetType = GTK_TYPE_WIDGET;
-    // if GtkWidget type is loaded
-    if (g_type_class_peek(widgetType) != NULL)
-    {
-        guint sig_id = g_signal_lookup("event", widgetType);
-        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
-    }

 }
 
 }
 

-static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+// Add signal emission hooks, to re-install idle handler when needed.
+static void wx_add_idle_hooks()

 {
 {

-    // this does not look possible, but just in case...
-    if (!wxTheApp)
-        return false;
-
-    bool moreIdles = false;
-
-#ifdef __WXDEBUG__
-    // don't generate the idle events while the assert modal dialog is shown,
-    // this matches the behavior of wxMSW
-    if (!wxTheApp->IsInAssert())
-#endif // __WXDEBUG__
+    // "event" hook

     {
     {

-        guint idleID_save;
+        static bool hook_installed;
+        if (!hook_installed)

         {
         {

-            // Allow another idle source to be added while this one is busy.
-            // Needed if an idle event handler runs a new event loop,
-            // for example by showing a dialog.
-#if wxUSE_THREADS
-            wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-            idleID_save = wxTheApp->m_idleTag;
-            wxTheApp->m_idleTag = 0;
-            g_isIdle = true;
-            wxAddEmissionHook();
-        }
-
-        // 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();
-
-        // Send idle event to all who request them as long as
-        // no events have popped up in the event queue.
-        do {
-            moreIdles = wxTheApp->ProcessIdle();
-        } while (moreIdles && gtk_events_pending() == 0);
-
-        // Release lock again
-        gdk_threads_leave();
-        
-        {
-            // If another idle source was added, remove it
-#if wxUSE_THREADS
-            wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-            if (wxTheApp->m_idleTag != 0)
-                g_source_remove(wxTheApp->m_idleTag);
-            wxTheApp->m_idleTag = idleID_save;
-            g_isIdle = false;
+            static guint sig_id;
+            if (sig_id == 0)
+                sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
+            hook_installed = true;
+            g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_installed, NULL);

         }
     }
         }
     }

-
-    if (!moreIdles)
+    // "size_allocate" hook
+    // Needed to match the behavior of the old idle system,
+    // but probably not necessary.

     {
     {

-#if wxUSE_THREADS
-        wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-        // Indicate that we are now in idle mode and event handlers
-        // will have to reinstall the idle handler again.
-        g_isIdle = true;
-        wxTheApp->m_idleTag = 0;
-
-        wxAddEmissionHook();
+        static bool hook_installed;
+        if (!hook_installed)
+        {
+            static guint sig_id;
+            if (sig_id == 0)
+                sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET);
+            hook_installed = true;
+            g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_installed, NULL);
+        }

     }
     }

-
-    // Return FALSE if no more idle events are to be sent
-    return moreIdles;

 }
 }

-} // extern "C"
-
-#if wxUSE_THREADS
-
-static GPollFunc wxgs_poll_func;

 
 extern "C" {
 
 extern "C" {

-static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
+static gboolean wxapp_idle_callback(gpointer)

 {
 {

-    gdk_threads_enter();
-
-    wxMutexGuiLeave();
-    g_mainThreadLocked = true;
-
-    gint res = (*wxgs_poll_func)(ufds, nfds, timeout);
-
-    wxMutexGuiEnter();
-    g_mainThreadLocked = false;
-
-    gdk_threads_leave();
-
-    return res;
+    return wxTheApp->DoIdle();

 }
 }
 
 }
 }
 

-#endif // wxUSE_THREADS
-
-void wxapp_install_idle_handler()
+bool wxApp::DoIdle()

 {
 {

-    if (wxTheApp == NULL)
-        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
 #if wxUSE_THREADS

-    wxMutexLocker lock(gs_idleTagsMutex);
+        wxMutexLocker lock(m_idleMutex);
+#endif
+        id_save = m_idleSourceId;
+        m_idleSourceId = 0;
+        wx_add_idle_hooks();
+
+#if wxDEBUG_LEVEL
+        // 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
 #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;
+    gdk_threads_enter();
+    bool needMore;
+    do {
+        ProcessPendingEvents();

 
 

-    // 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)") );
+        needMore = ProcessIdle();
+    } while (needMore && gtk_events_pending() == 0);
+    gdk_threads_leave();

 
 

-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
+#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;
+    }

 
 

-    g_isIdle = false;
+    // Pending events can be added asynchronously,
+    // need to keep idle source if any have appeared
+    if (HasPendingEvents())
+        needMore = true;

 
 

-    // This routine gets called by all event handlers
-    // indicating that the idle is over. It may also
-    // get called from other thread for sending events
-    // to the main thread (and processing these in
-    // idle time). Very low priority.
-    wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
+    // 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;

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


@@ -302,12 +173,14 @@ void wxapp_install_idle_handler()
 
 GtkWidget* wxGetRootWindow()
 {
 
 GtkWidget* wxGetRootWindow()
 {

-    if (gs_RootWindow == NULL)
+    static GtkWidget *s_RootWindow = NULL;
+
+    if (s_RootWindow == NULL)

     {
     {

-        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-        gtk_widget_realize( gs_RootWindow );
+        s_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( s_RootWindow );

     }
     }

-    return gs_RootWindow;
+    return s_RootWindow;

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


@@ -316,29 +189,38 @@ GtkWidget* wxGetRootWindow()
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-

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

-#ifdef __WXDEBUG__

     m_isInAssert = false;
     m_isInAssert = false;

-#endif // __WXDEBUG__
-
-    m_idleTag = 0;
-    g_isIdle = true;
-    wxapp_install_idle_handler();
-
-    // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
-    m_glVisualInfo = (void *) NULL;
-    m_glFBCInfo = (void *) NULL;
+    m_idleSourceId = 0;

 }
 
 wxApp::~wxApp()
 {
 }
 
 wxApp::~wxApp()
 {

-    if (m_idleTag)
-        g_source_remove( m_idleTag );
+}
+
+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);
+
+        return false;
+    }
+
+    gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE);
+
+    return true;

 }
 
 bool wxApp::OnInitGui()
 }
 
 bool wxApp::OnInitGui()


@@ -348,7 +230,7 @@ bool wxApp::OnInitGui()
 
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that
 
     // 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)
+    if ( GetXVisualInfo() )

     {
         GdkVisual* vis = gtk_widget_get_default_visual();
 
     {
         GdkVisual* vis = gtk_widget_get_default_visual();
 


@@ -384,53 +266,41 @@ bool wxApp::OnInitGui()
         }
     }
 
         }
     }
 

-    return true;
-}
-
-GdkVisual *wxApp::GetGdkVisual()
-{
-    GdkVisual *visual = NULL;
-
-    if (m_glVisualInfo)
-        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
-    else
-        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
-
-    wxASSERT( visual );
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+    if ( !GetHildonProgram() )
+    {
+        wxLogError(_("Unable to initialize Hildon program"));
+        return false;
+    }
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2

 
 

-    return visual;
+    return true;

 }
 
 }
 

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

 {
 {

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

 
 #if wxUSE_THREADS
     if (!g_thread_supported())
 
 #if wxUSE_THREADS
     if (!g_thread_supported())

+    {

         g_thread_init(NULL);
         g_thread_init(NULL);

-
-    wxgs_poll_func = g_main_context_get_poll_func(NULL);
-    g_main_context_set_poll_func(NULL, wxapp_poll_func);
+        gdk_threads_init();
+    }

 #endif // wxUSE_THREADS
 
 #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;
     // 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
 
     // 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)
+    wxString encName(wxGetenv(wxT("G_FILENAME_ENCODING")));
+    encName = encName.BeforeFirst(wxT(','));
+    if (encName.CmpNoCase(wxT("@locale")) == 0)

         encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL
         encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL


@@ -440,29 +310,38 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         //     filenames in this locale too
         encName = wxLocale::GetSystemEncodingName().Upper();
         // (3) finally use UTF-8 by default
         //     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);
+        if (encName.empty() || encName == wxT("US-ASCII"))
+            encName = wxT("UTF-8");
+        wxSetEnv(wxT("G_FILENAME_ENCODING"), encName);

     }
 #else
     if (encName.empty())
     }
 #else
     if (encName.empty())

-        encName = _T("UTF-8");
+        encName = wxT("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;
 
 #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
 #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++ )
+    char **argvGTK = new char *[argc_ + 1];
+    for ( i = 0; i < argc_; i++ )

     {
     {

-        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
+        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i]));

     }
 
     }
 

-    argvGTK[argc] = NULL;
+    argvGTK[argc_] = NULL;

 
 

-    int argcGTK = argc;
+    int argcGTK = argc_;

 
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
 
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?


@@ -470,19 +349,21 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else
     init_result = gtk_init_check( &argcGTK, &argvGTK );
 #endif
 #else
     init_result = gtk_init_check( &argcGTK, &argvGTK );
 #endif

+    wxUpdateLocaleIsUtf8();

 
 

-    if ( argcGTK != argc )
+    if ( argcGTK != argc_ )

     {
         // we have to drop the parameters which were consumed by GTK+
         for ( i = 0; i < argcGTK; i++ )
         {
     {
         // 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 )
+            while ( strcmp(wxConvUTF8.cWX2MB(argv_[i]), argvGTK[i]) != 0 )

             {
             {

-                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
+                memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_));

             }
         }
 
             }
         }
 

-        argc = argcGTK;
+        argc_ = argcGTK;
+        argv_[argc_] = NULL;

     }
     //else: gtk_init() didn't modify our parameters
 
     }
     //else: gtk_init() didn't modify our parameters
 


@@ -494,43 +375,104 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     delete [] argvGTK;
 #else // !wxUSE_UNICODE
 
     delete [] argvGTK;
 #else // !wxUSE_UNICODE

-    // gtk_init() shouldn't actually change argv itself (just its contents) so
+    // gtk_init() shouldn't actually change argv_ itself (just its contents) so

     // it's ok to pass pointer to it
     // it's ok to pass pointer to it

-    init_result = gtk_init_check( &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();
+    // update internal arg[cv] as GTK+ may have removed processed options:
+    this->argc = argc_;
+    this->argv = argv_;

 
 

-    if ( !wxAppBase::Initialize(argc, argv) )
+    if ( m_traits )

     {
     {

-        gdk_threads_leave();
+        // 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;
     }
 
         return false;
     }
 

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

 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

+    // make sure GtkWidget type is loaded, idle hooks need it
+    g_type_class_ref(GTK_TYPE_WIDGET);
+    WakeUpIdle();
+

     return true;
 }
 
 void wxApp::CleanUp()
 {
     return true;
 }
 
 void wxApp::CleanUp()
 {

+    if (m_idleSourceId != 0)
+        g_source_remove(m_idleSourceId);
+
+    // release reference acquired by Initialize()
+    g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET));
+

     gdk_threads_leave();
 
     wxAppBase::CleanUp();
 }
 
     gdk_threads_leave();
 
     wxAppBase::CleanUp();
 }
 

-#ifdef __WXDEBUG__
+void wxApp::WakeUpIdle()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(m_idleMutex);
+#endif
+    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)
+    {
+        g_source_remove(m_idleSourceId);
+        m_idleSourceId = 0;
+        wx_add_idle_hooks();
+    }
+    return gtk_events_pending() != 0;
+}

 
 void wxApp::OnAssertFailure(const wxChar *file,
                             int line,
 
 void wxApp::OnAssertFailure(const wxChar *file,
                             int line,


@@ -538,27 +480,41 @@ void wxApp::OnAssertFailure(const wxChar *file,
                             const wxChar* cond,
                             const wxChar *msg)
 {
                             const wxChar* cond,
                             const wxChar *msg)
 {

-
+    // there is no need to do anything if asserts are disabled in this build
+    // anyhow
+#if wxDEBUG_LEVEL

     // block wx idle events while assert dialog is showing
     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);
 
     m_isInAssert = false;
     // block wx idle events while assert dialog is showing
     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);
 
     m_isInAssert = false;

+#else // !wxDEBUG_LEVEL
+    wxUnusedVar(file);
+    wxUnusedVar(line);
+    wxUnusedVar(func);
+    wxUnusedVar(cond);
+    wxUnusedVar(msg);
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL

 }
 
 }
 

-#endif // __WXDEBUG__
+#if wxUSE_THREADS
+void wxGUIAppTraits::MutexGuiEnter()
+{
+    gdk_threads_enter();
+}

 
 

-void wxApp::SuspendIdleCallback()
+void wxGUIAppTraits::MutexGuiLeave()

 {
 {

-#if wxUSE_THREADS
-    wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-    if (m_idleTag != 0)
-    {
-        g_source_remove(m_idleTag);
-        m_idleTag = 0;
-        g_isIdle = true;
-        wxAddEmissionHook();
-    }
+    gdk_threads_leave();
+}
+#endif // wxUSE_THREADS
+
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+// Maemo-specific method: get the main program object
+HildonProgram *wxApp::GetHildonProgram()
+{ 
+    return hildon_program_get_instance(); 

 }
 }

+    
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2