Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index f3d469f67d9017c843eac768c94fea9ec90772dc..28556077303c4f726eeae29565d4c6aabfdf88ce 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -290,18 +290,6 @@ wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
 }
 
 
 }
 
 

-#if wxUSE_INTL && defined(__UNIX__)
-void wxGUIAppTraits::SetLocale()
-{
-#ifdef __WXGTK3__
-    setlocale(LC_ALL, "");
-#else
-    gtk_set_locale();
-#endif
-    wxUpdateLocaleIsUtf8();
-}
-#endif
-

 #ifdef __UNIX__
 
 #if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 #ifdef __UNIX__
 
 #if wxDEBUG_LEVEL && wxUSE_STACKWALKER


@@ -319,10 +307,12 @@ protected:
 
         // append this stack frame's info in the dialog
         if (!frame.GetFileName().empty() || !fncname.empty())
 
         // append this stack frame's info in the dialog
         if (!frame.GetFileName().empty() || !fncname.empty())

+        {

             gtk_assert_dialog_append_stack_frame(m_dlg,
             gtk_assert_dialog_append_stack_frame(m_dlg,

-                                                fncname.mb_str(),
-                                                frame.GetFileName().mb_str(),
+                                                fncname.utf8_str(),
+                                                frame.GetFileName().utf8_str(),

                                                 frame.GetLine());
                                                 frame.GetLine());

+        }

     }
 
 private:
     }
 
 private:


@@ -333,7 +323,7 @@ static void get_stackframe_callback(void* p)
 {
     StackDump* dump = static_cast<StackDump*>(p);
     // skip over frames up to including wxOnAssert()
 {
     StackDump* dump = static_cast<StackDump*>(p);
     // skip over frames up to including wxOnAssert()

-    dump->ProcessFrames(3);
+    dump->ProcessFrames(7);

 }
 
 #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER
 }
 
 #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER


@@ -469,39 +459,35 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
 {
     wxString usage;
 
 {
     wxString usage;
 

+    // check whether GLib version is greater than 2.6 but also lower than 2.33
+    // because, as we use the undocumented _GOptionGroup struct, we don't want
+    // to run this code with future versions which might change it (2.32 is the
+    // latest one at the time of this writing)
+    if (glib_check_version(2,33,0))

     {
     {

-        // since GTK>=2.6, we can use the glib_check_version() symbol...
-
-        // check whether GLib version is greater than 2.6 but also lower than 2.33
-        // because, as we use the undocumented _GOptionGroup struct, we don't want
-        // to run this code with future versions which might change it (2.32 is the
-        // latest one at the time of this writing)
-        if (glib_check_version(2,33,0))
-        {
-            usage << _("The following standard GTK+ options are also supported:\n");
+        usage << _("The following standard GTK+ options are also supported:\n");

 
 

-            // passing true here means that the function can open the default
-            // display while parsing (not really used here anyhow)
-            GOptionGroup *gtkOpts = gtk_get_option_group(true);
+        // passing true here means that the function can open the default
+        // display while parsing (not really used here anyhow)
+        GOptionGroup *gtkOpts = gtk_get_option_group(true);

 
 

-            // WARNING: here we access the internals of GOptionGroup:
-            GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
-            unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
-            wxArrayString namesOptions, descOptions;
+        // WARNING: here we access the internals of GOptionGroup:
+        GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
+        unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
+        wxArrayString namesOptions, descOptions;

 
 

-            for ( size_t n = 0; n < n_entries; n++ )
-            {
-                if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
-                    continue;       // skip
-
-                names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
+        for ( size_t n = 0; n < n_entries; n++ )
+        {
+            if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
+                continue;       // skip

 
 

-                const gchar * const entryDesc = entries[n].description;
-                desc.push_back(wxString(entryDesc));
-            }
+            names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));

 
 

-            g_option_group_free (gtkOpts);
+            const gchar * const entryDesc = entries[n].description;
+            desc.push_back(wxString(entryDesc));

         }
         }

+
+        g_option_group_free (gtkOpts);

     }
 
     return usage;
     }
 
     return usage;