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 c510079d6e11e5bca02f5582e1bfa428a6ecf135..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


@@ -56,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;
 }


@@ -69,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);

         }
     }
 }
         }
     }
 }


@@ -110,7 +117,7 @@ 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;
 #endif
         id_save = m_idleSourceId;
         m_idleSourceId = 0;


@@ -118,7 +125,7 @@ bool wxApp::DoIdle()
 
 #if wxDEBUG_LEVEL
         // don't generate the idle events while the assert modal dialog is shown,
 
 #if wxDEBUG_LEVEL
         // 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


@@ -134,7 +141,7 @@ bool wxApp::DoIdle()
     gdk_threads_leave();
 
 #if wxUSE_THREADS
     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)


@@ -146,7 +153,8 @@ bool wxApp::DoIdle()
 
     // Pending events can be added asynchronously,
     // need to keep idle source if any have appeared
 
     // Pending events can be added asynchronously,
     // need to keep idle source if any have appeared

-    needMore = needMore || HasPendingEvents();
+    if (HasPendingEvents())
+        needMore = true;

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


@@ -185,10 +193,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 wxApp::wxApp()
 {
     m_isInAssert = false;
 wxApp::wxApp()
 {
     m_isInAssert = false;

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

     m_idleSourceId = 0;
 }
 
     m_idleSourceId = 0;
 }
 


@@ -225,6 +229,7 @@ bool wxApp::OnInitGui()
     if ( !wxAppBase::OnInitGui() )
         return false;
 
     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() )


@@ -262,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_)
 {


@@ -307,13 +297,14 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
 
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
 

+#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


@@ -322,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, "")


@@ -339,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;


@@ -360,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();
 


@@ -435,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();


@@ -465,20 +468,12 @@ void wxApp::CleanUp()
     gdk_threads_leave();
 
     wxAppBase::CleanUp();
     gdk_threads_leave();
 
     wxAppBase::CleanUp();

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

 }
 
 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);


@@ -489,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)
     {


@@ -535,3 +530,12 @@ void wxGUIAppTraits::MutexGuiLeave()
     gdk_threads_leave();
 }
 #endif // wxUSE_THREADS
     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