remove checks for new dc code

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 33cf2dc6a0e76688f7ab048bade8bd84cb995280..f530f0998c8c34894c98307aeb77bbd6ee6eb82c 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,10 +26,13 @@
     #include <gpe/init.h>
 #endif
 
     #include <gpe/init.h>
 #endif
 

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

 #include "wx/gtk/private.h"
 #include "wx/apptrait.h"
 
 #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>
 
 //-----------------------------------------------------------------------------
 #include <gdk/gdkx.h>
 
 //-----------------------------------------------------------------------------


@@ -324,6 +321,15 @@ bool wxApp::OnInitGui()
         }
     }
 
         }
     }
 

+#if wxUSE_LIBHILDON
+    m_hildonProgram = hildon_program_get_instance();
+    if ( !m_hildonProgram )
+    {
+        wxLogError(_("Unable to initialize Hildon program"));
+        return false;
+    }
+#endif // wxUSE_LIBHILDON
+

     return true;
 }
 
     return true;
 }
 


@@ -400,10 +406,10 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 
 
     bool init_result;
 
 
     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++ )
     {


@@ -463,7 +469,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         wxArrayString opt, desc;
         m_traits->GetStandardCmdLineOptions(opt, desc);
 
         wxArrayString opt, desc;
         m_traits->GetStandardCmdLineOptions(opt, desc);
 

-        for ( int i = 0; i < argc_; i++ )
+        for ( i = 0; i < argc_; i++ )

         {
             // leave just the names of the options with values
             const wxString str = wxString(argv_[i]).BeforeFirst('=');
         {
             // leave just the names of the options with values
             const wxString str = wxString(argv_[i]).BeforeFirst('=');


@@ -515,16 +521,21 @@ 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));
 
     gdk_threads_leave();
 
     wxAppBase::CleanUp();
     // release reference acquired by Initialize()
     g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET));
 
     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()
 }
 
 void wxApp::WakeUpIdle()