From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 1 Apr 2013 23:59:37 +0000 (+0000)
Subject: Don't use GetStandardCmdLineOptions() under non-Unix platforms.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2b76114b611660e82ddf731459c9b3bef9ce012f

Don't use GetStandardCmdLineOptions() under non-Unix platforms.

The GTK+ standard options are only available under Unix.

Closes #15131.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index c25b9faa05..fcd4738479 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -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