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

Fix GetInstallPrefix availability check

Browse Source 
Add wxHAS_STDPATHS_INSTALL_PREFIX to make checking for
wxStandardPaths::GetInstallPrefix()'s availability simpler, as the
condition under which it is compiled is nontrivial.

Fixes compilation after 2c24ee9216 on
Cygwin, which is a UNIX, but its wxStandardPaths implementation is a
Windows one.

(cherry picked from commit 13862ad8e6)
This commit is contained in:
Václav Slavík
2016-12-11 15:18:24 +01:00
parent ef12daba86
commit 723489e2d9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/stdpaths.h
View File

@@ -184,6 +184,7 @@ protected:
#elif defined(__UNIX__) #elif defined(__UNIX__)
#include "wx/unix/stdpaths.h" #include "wx/unix/stdpaths.h"
#define wxHAS_NATIVE_STDPATHS #define wxHAS_NATIVE_STDPATHS
#define wxHAS_STDPATHS_INSTALL_PREFIX
#endif #endif
#endif #endif
@@ -195,6 +196,7 @@ protected:
// wxUSE_STDPATHS=0, so that our code can still use wxStandardPaths. // wxUSE_STDPATHS=0, so that our code can still use wxStandardPaths.
#ifndef wxHAS_NATIVE_STDPATHS #ifndef wxHAS_NATIVE_STDPATHS
#define wxHAS_STDPATHS_INSTALL_PREFIX
class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
{ {
public: public:

2
src/common/translation.cpp
View File

@@ -1813,7 +1813,7 @@ wxArrayString GetSearchPrefixes()
if ( paths.Index(stdp) == wxNOT_FOUND ) if ( paths.Index(stdp) == wxNOT_FOUND )
paths.Add(stdp); paths.Add(stdp);
#if defined(__UNIX__) && !defined(__WXOSX_COCOA__) && !defined(__WXOSX_IPHONE__) && !defined(__DARWIN__) #ifdef wxHAS_STDPATHS_INSTALL_PREFIX
stdp = wxStandardPaths::Get().GetInstallPrefix() + "/share/locale"; stdp = wxStandardPaths::Get().GetInstallPrefix() + "/share/locale";
if ( paths.Index(stdp) == wxNOT_FOUND ) if ( paths.Index(stdp) == wxNOT_FOUND )
paths.Add(stdp); paths.Add(stdp);