Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-04-01 23:59:37 +00:00
parent 6a63bdc860
commit 2b76114b61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/utilsgtk.cpp
View File

@@ -401,6 +401,8 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const
#endif // __UNIX__ || __OS2__ #endif // __UNIX__ || __OS2__
#ifdef __UNIX__
// see the hack below in wxCmdLineParser::GetUsageString(). // see the hack below in wxCmdLineParser::GetUsageString().
// TODO: replace this hack with a g_option_group_get_entries() // TODO: replace this hack with a g_option_group_get_entries()
// call as soon as such function exists; // 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 wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
{ {
wxString ret; wxString ret;
@@ -446,8 +449,6 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
return wxT(" ") + ret; return wxT(" ") + ret;
} }
#ifdef __UNIX__
wxString wxString
wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
wxArrayString& desc) const wxArrayString& desc) const