X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a0c6eff1bbb66a5d9d261b0516444b350c98dfd..3ac6cf59fa8620967cd94da500a0c3bc6295a5cb:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index a542d3066d..fcd4738479 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -334,9 +334,9 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) // wxWidgets idle processing to work correctly which might not be the // case when assert happens GtkWidget *dialog = gtk_assert_dialog_new(); -#if wxUSE_STACKWALKER gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str()); +#if wxUSE_STACKWALKER // save the current stack ow... StackDump dump(GTK_ASSERT_DIALOG(dialog)); dump.SaveStack(100); // showing more than 100 frames is not very useful @@ -401,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; @@ -427,6 +429,7 @@ struct _GOptionGroup GOptionErrorFunc error_func; }; +static wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) { wxString ret; @@ -446,8 +449,6 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) return wxT(" ") + ret; } -#ifdef __UNIX__ - wxString wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, wxArrayString& desc) const