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 f90decedb13fb5cbf897a22c0a6b8cc05322a180..823da625a20580bf39a6fe6aae266f9549d09e2a 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -26,7 +26,6 @@
     #include <gpe/init.h>
 #endif
 
     #include <gpe/init.h>
 #endif
 

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

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


@@ -38,7 +37,8 @@
     #include <hildon/hildon.h>
 #endif // wxUSE_LIBHILDON2
 
     #include <hildon/hildon.h>
 #endif // wxUSE_LIBHILDON2
 

-#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

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


@@ -86,7 +86,7 @@ static void wx_add_idle_hooks()
         }
     }
     // "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.
     {
         static bool hook_installed;
     // but probably not necessary.
     {
         static bool hook_installed;


@@ -125,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


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


@@ -266,6 +267,7 @@ bool wxApp::OnInitGui()
             }
         }
     }
             }
         }
     }

+#endif

 
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
     if ( !GetHildonProgram() )
 
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
     if ( !GetHildonProgram() )


@@ -295,6 +297,7 @@ 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
     // decide which conversion to use for the file names
 
     // (1) this variable exists for the sole purpose of specifying the encoding


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


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


@@ -439,7 +443,7 @@ 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();
 
 #if wxUSE_INTL
     gdk_threads_enter();
 
 #if wxUSE_INTL