using Destroy, as otherwise the remnants get into the way for some other tests

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index a542d3066d124417577d60fadc43e0f7e3128bf2..fcd473847964047ee179e506f48219138faa4eb4 100644 (file)
--- 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();
         // 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());
 
         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
         // 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__
 
 
 #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;
 // 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;
 };
 
   GOptionErrorFunc error_func;
 };
 

+static

 wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
 {
     wxString ret;
 wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
 {
     wxString ret;


@@ -446,8 +449,6 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
     return wxT("  ") + ret;
 }
 
     return wxT("  ") + ret;
 }
 

-#ifdef __UNIX__
-

 wxString
 wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
                                           wxArrayString& desc) const
 wxString
 wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
                                           wxArrayString& desc) const