Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 12b3f4dfdde251d48ddfc98236d6594df53f91f8..823da625a20580bf39a6fe6aae266f9549d09e2a 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -26,14 +26,19 @@
     #include <gpe/init.h>
 #endif
 
     #include <gpe/init.h>
 #endif
 

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

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

+#include "wx/fontmap.h"

 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-program.h>
 #endif // wxUSE_LIBHILDON
 
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-program.h>
 #endif // wxUSE_LIBHILDON
 

-#include <gdk/gdkx.h>
+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2
+
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // link GnomeVFS
 
 //-----------------------------------------------------------------------------
 // link GnomeVFS


@@ -44,72 +49,6 @@
     wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 
     wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-bool   g_mainThreadLocked = false;
-
-static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
-
-//-----------------------------------------------------------------------------
-// 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;
-
-#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 (EventsPending())
-        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;
-}
-

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


@@ -122,9 +61,9 @@ wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
     wxApp* app = wxTheApp;
     if (app != NULL)
         app->WakeUpIdle();
     wxApp* app = wxTheApp;
     if (app != NULL)
         app->WakeUpIdle();

-    gulong* hook_id = (gulong*)data;
+    bool* hook_installed = (bool*)data;

     // record that hook is not installed
     // record that hook is not installed

-    *hook_id = 0;
+    *hook_installed = false;

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


@@ -135,28 +74,30 @@ static void wx_add_idle_hooks()
 {
     // "event" hook
     {
 {
     // "event" hook
     {

-        static gulong hook_id = 0;
-        if (hook_id == 0)
+        static bool hook_installed;
+        if (!hook_installed)

         {
         {

-            static guint sig_id = 0;
+            static guint sig_id;

             if (sig_id == 0)
                 sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
             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);
+            hook_installed = true;
+            g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_installed, NULL);

         }
     }
     // "size_allocate" hook
         }
     }
     // "size_allocate" hook

-    // Needed to match the behavior of the old idle system,
+    // Needed to match the behaviour of the old idle system,

     // but probably not necessary.
     {
     // but probably not necessary.
     {

-        static gulong hook_id = 0;
-        if (hook_id == 0)
+        static bool hook_installed;
+        if (!hook_installed)

         {
         {

-            static guint sig_id = 0;
+            static guint sig_id;

             if (sig_id == 0)
                 sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET);
             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);
+            hook_installed = true;
+            g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_installed, NULL);

         }
     }
 }
         }
     }
 }


@@ -176,14 +117,15 @@ bool wxApp::DoIdle()
         // Needed if an idle event handler runs a new event loop,
         // for example by showing a dialog.
 #if wxUSE_THREADS
         // Needed if an idle event handler runs a new event loop,
         // for example by showing a dialog.
 #if wxUSE_THREADS

-        wxMutexLocker lock(*m_idleMutex);
+        wxMutexLocker lock(m_idleMutex);

 #endif
         id_save = m_idleSourceId;
         m_idleSourceId = 0;
         wx_add_idle_hooks();
 #endif
         id_save = m_idleSourceId;
         m_idleSourceId = 0;
         wx_add_idle_hooks();

-#ifdef __WXDEBUG__
+
+#if wxDEBUG_LEVEL

         // don't generate the idle events while the assert modal dialog is shown,
         // don't generate the idle events while the assert modal dialog is shown,

-        // this matches the behavior of wxMSW
+        // this matches the behaviour of wxMSW

         if (m_isInAssert)
             return false;
 #endif
         if (m_isInAssert)
             return false;
 #endif


@@ -192,12 +134,14 @@ bool wxApp::DoIdle()
     gdk_threads_enter();
     bool needMore;
     do {
     gdk_threads_enter();
     bool needMore;
     do {

+        ProcessPendingEvents();
+

         needMore = ProcessIdle();
     } while (needMore && gtk_events_pending() == 0);
     gdk_threads_leave();
 
 #if wxUSE_THREADS
         needMore = ProcessIdle();
     } while (needMore && gtk_events_pending() == 0);
     gdk_threads_leave();
 
 #if wxUSE_THREADS

-    wxMutexLocker lock(*m_idleMutex);
+    wxMutexLocker lock(m_idleMutex);

 #endif
     // if a new idle source was added during ProcessIdle
     if (m_idleSourceId != 0)
 #endif
     // if a new idle source was added during ProcessIdle
     if (m_idleSourceId != 0)


@@ -206,6 +150,12 @@ bool wxApp::DoIdle()
         g_source_remove(m_idleSourceId);
         m_idleSourceId = 0;
     }
         g_source_remove(m_idleSourceId);
         m_idleSourceId = 0;
     }

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

     // if more idle processing requested
     if (needMore)
     {
     // if more idle processing requested
     if (needMore)
     {


@@ -218,43 +168,20 @@ bool wxApp::DoIdle()
     return false;
 }
 
     return false;
 }
 

-#if wxUSE_THREADS
-
-static GPollFunc wxgs_poll_func;
-
-extern "C" {
-static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
-{
-    gdk_threads_enter();
-
-    wxMutexGuiLeave();
-    g_mainThreadLocked = true;
-
-    gint res = (*wxgs_poll_func)(ufds, nfds, timeout);
-
-    wxMutexGuiEnter();
-    g_mainThreadLocked = false;
-
-    gdk_threads_leave();
-
-    return res;
-}
-}
-
-#endif // wxUSE_THREADS
-

 //-----------------------------------------------------------------------------
 // Access to the root window global
 //-----------------------------------------------------------------------------
 
 GtkWidget* wxGetRootWindow()
 {
 //-----------------------------------------------------------------------------
 // Access to the root window global
 //-----------------------------------------------------------------------------
 
 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;

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


@@ -265,12 +192,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-#ifdef __WXDEBUG__

     m_isInAssert = false;
     m_isInAssert = false;

-#endif // __WXDEBUG__
-#if wxUSE_THREADS
-    m_idleMutex = NULL;
-#endif

     m_idleSourceId = 0;
 }
 
     m_idleSourceId = 0;
 }
 


@@ -278,11 +200,36 @@ wxApp::~wxApp()
 {
 }
 
 {
 }
 

+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()
 {
     if ( !wxAppBase::OnInitGui() )
         return false;
 
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
         return false;
 

+#ifndef __WXGTK3__

     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that
     if ( GetXVisualInfo() )
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that
     if ( GetXVisualInfo() )


@@ -320,34 +267,19 @@ bool wxApp::OnInitGui()
             }
         }
     }
             }
         }
     }

+#endif

 
 

-#if wxUSE_LIBHILDON
-    m_hildonProgram = hildon_program_get_instance();
-    if ( !m_hildonProgram )
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+    if ( !GetHildonProgram() )

     {
         wxLogError(_("Unable to initialize Hildon program"));
         return false;
     }
     {
         wxLogError(_("Unable to initialize Hildon program"));
         return false;
     }

-#endif // wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2

 
     return true;
 }
 
 
     return true;
 }
 

-GdkVisual *wxApp::GetGdkVisual()
-{
-    GdkVisual *visual = NULL;
-
-    XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo();
-    if ( xvi )
-        visual = gdkx_visual_get( xvi->visualid );
-    else
-        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
-
-    wxASSERT( visual );
-
-    return visual;
-}
-

 // use unusual names for the parameters to avoid conflict with wxApp::arg[cv]
 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_)
 {


@@ -356,28 +288,23 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 
 #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
 

-    // 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

 
 

+#ifdef __UNIX__

     // 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


@@ -386,14 +313,30 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         // (2) if a non default locale is set, assume that the user wants his
         //     filenames in this locale too
         encName = wxLocale::GetSystemEncodingName().Upper();
         // (2) if a non default locale is set, assume that the user wants his
         //     filenames in this locale too
         encName = wxLocale::GetSystemEncodingName().Upper();

+
+        // But don't consider ASCII in this case.
+        if ( !encName.empty() )
+        {
+#if wxUSE_FONTMAP
+            wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encName);
+            if ( enc == wxFONTENCODING_DEFAULT )
+#else // !wxUSE_FONTMAP
+            if ( encName == wxT("US-ASCII") )
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+            {
+                // This means US-ASCII when returned from GetEncodingFromName().
+                encName.clear();
+            }
+        }
+

         // (3) finally use UTF-8 by default
         // (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("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, "")
 
     // 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, "")


@@ -403,6 +346,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 #endif // wxUSE_INTL
     static wxConvBrokenFileNames fileconv(encName);
     wxConvFileName = &fileconv;
 #endif // wxUSE_INTL
     static wxConvBrokenFileNames fileconv(encName);
     wxConvFileName = &fileconv;

+#endif // __UNIX__

 
 
     bool init_result;
 
 
     bool init_result;


@@ -424,7 +368,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #else
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #else

-    init_result = gtk_init_check( &argcGTK, &argvGTK );
+    init_result = gtk_init_check( &argcGTK, &argvGTK ) != 0;

 #endif
     wxUpdateLocaleIsUtf8();
 
 #endif
     wxUpdateLocaleIsUtf8();
 


@@ -440,6 +384,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         }
 
         argc_ = argcGTK;
         }
 
         argc_ = argcGTK;

+        argv_[argc_] = NULL;

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


@@ -498,18 +443,13 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         return false;
     }
 
         return false;
     }
 

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

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    wxSetDetectableAutoRepeat( true );
-

 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
 #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();
     // make sure GtkWidget type is loaded, idle hooks need it
     g_type_class_ref(GTK_TYPE_WIDGET);
     WakeUpIdle();


@@ -521,10 +461,7 @@ void wxApp::CleanUp()
 {
     if (m_idleSourceId != 0)
         g_source_remove(m_idleSourceId);
 {
     if (m_idleSourceId != 0)
         g_source_remove(m_idleSourceId);

-#if wxUSE_THREADS
-    delete m_idleMutex;
-    m_idleMutex = NULL;
-#endif
+

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


@@ -536,7 +473,7 @@ void wxApp::CleanUp()
 void wxApp::WakeUpIdle()
 {
 #if wxUSE_THREADS
 void wxApp::WakeUpIdle()
 {
 #if wxUSE_THREADS

-    wxMutexLocker lock(*m_idleMutex);
+    wxMutexLocker lock(m_idleMutex);

 #endif
     if (m_idleSourceId == 0)
         m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
 #endif
     if (m_idleSourceId == 0)
         m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);


@@ -547,7 +484,7 @@ void wxApp::WakeUpIdle()
 bool wxApp::EventsPending()
 {
 #if wxUSE_THREADS
 bool wxApp::EventsPending()
 {
 #if wxUSE_THREADS

-    wxMutexLocker lock(*m_idleMutex);
+    wxMutexLocker lock(m_idleMutex);

 #endif
     if (m_idleSourceId != 0)
     {
 #endif
     if (m_idleSourceId != 0)
     {


@@ -558,21 +495,47 @@ bool wxApp::EventsPending()
     return gtk_events_pending() != 0;
 }
 
     return gtk_events_pending() != 0;
 }
 

-#ifdef __WXDEBUG__
-

 void wxApp::OnAssertFailure(const wxChar *file,
                             int line,
                             const wxChar* func,
                             const wxChar* cond,
                             const wxChar *msg)
 {
 void wxApp::OnAssertFailure(const wxChar *file,
                             int line,
                             const wxChar* func,
                             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
+}
+
+#if wxUSE_THREADS
+void wxGUIAppTraits::MutexGuiEnter()
+{
+    gdk_threads_enter();
+}
+
+void wxGUIAppTraits::MutexGuiLeave()
+{
+    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 // __WXDEBUG__
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2