X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a73251a80d95efa37bf1fc7879b21a6aec57910d..507a6cd69a2097a415b81745b014b286ba3d451b:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 728c9f6cb9..c25b9faa05 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(p); // skip over frames up to including wxOnAssert() - dump->ProcessFrames(3); + dump->ProcessFrames(6); } #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER @@ -504,17 +489,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