X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a73251a80d95efa37bf1fc7879b21a6aec57910d..49f7bb4f7aab9e7775e0e933e09ed7386a857f36:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 728c9f6cb9..fcd4738479 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -97,11 +97,6 @@ void wxDisplaySizeMM( int *width, int *height )
     if (height) *height = gdk_screen_height_mm();
 }
 
-void wxGetMousePosition( int* x, int* y )
-{
-    gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL);
-}
-
 bool wxColourDisplay()
 {
     return true;
@@ -290,18 +285,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
@@ -319,10 +302,12 @@ protected:
 
         // append this stack frame's info in the dialog
         if (!frame.GetFileName().empty() || !fncname.empty())
+        {
             gtk_assert_dialog_append_stack_frame(m_dlg,
-                                                fncname.mb_str(),
-                                                frame.GetFileName().mb_str(),
+                                                fncname.utf8_str(),
+                                                frame.GetFileName().utf8_str(),
                                                 frame.GetLine());
+        }
     }
 
 private:
@@ -333,7 +318,7 @@ static void get_stackframe_callback(void* p)
 {
     StackDump* dump = static_cast<StackDump*>(p);
     // skip over frames up to including wxOnAssert()
-    dump->ProcessFrames(3);
+    dump->ProcessFrames(6);
 }
 
 #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER
@@ -416,6 +401,8 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const
 
 #endif // __UNIX__ || __OS2__
 
+#ifdef __UNIX__
+
 // see the hack below in wxCmdLineParser::GetUsageString().
 // TODO: replace this hack with a g_option_group_get_entries()
 //       call as soon as such function exists;
@@ -442,6 +429,7 @@ struct _GOptionGroup
   GOptionErrorFunc error_func;
 };
 
+static
 wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
 {
     wxString ret;
@@ -461,8 +449,6 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
     return wxT("  ") + ret;
 }
 
-#ifdef __UNIX__
-
 wxString
 wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
                                           wxArrayString& desc) const
@@ -504,17 +490,3 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
 }
 
 #endif // __UNIX__
-
-#ifdef GDK_WINDOWING_BROADWAY
-
-bool wxLaunchDefaultApplication(const wxString& document, int flags)
-{
-    return false;
-}
-
-bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
-{
-    return false;
-}
-
-#endif