Use wxGetInstallPrefix() instead of wxINSTALL_PREFIX (makes relocatable packages possible)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -86,6 +86,10 @@ WXDLLEXPORT int wxGetOsVersion(int *majorVsn = (int *) NULL,
|
|||||||
// Return a string with the current date/time
|
// Return a string with the current date/time
|
||||||
WXDLLEXPORT wxString wxNow();
|
WXDLLEXPORT wxString wxNow();
|
||||||
|
|
||||||
|
// Return path where wxWindows is installed (mostly useful in Unices)
|
||||||
|
WXDLLEXPORT const wxChar *wxGetInstallPrefix();
|
||||||
|
|
||||||
|
|
||||||
#if wxUSE_GUI
|
#if wxUSE_GUI
|
||||||
// Don't synthesize KeyUp events holding down a key and producing
|
// Don't synthesize KeyUp events holding down a key and producing
|
||||||
// KeyDown events with autorepeat. On by default and always on
|
// KeyDown events with autorepeat. On by default and always on
|
||||||
|
@@ -1072,6 +1072,21 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
|
|||||||
|
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
|
|
||||||
|
const wxChar *wxGetInstallPrefix()
|
||||||
|
{
|
||||||
|
wxString prefix;
|
||||||
|
|
||||||
|
if ( wxGetEnv(wxT("WX_PREFIX"), &prefix) )
|
||||||
|
return prefix.c_str();
|
||||||
|
|
||||||
|
#ifdef wxINSTALL_PREFIX
|
||||||
|
return wxT(wxINSTALL_PREFIX);
|
||||||
|
#else
|
||||||
|
return wxT("");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// network and user id functions
|
// network and user id functions
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -2034,7 +2034,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
|
|||||||
- afmFile = fopen() may fail and in that case the next if branch
|
- afmFile = fopen() may fail and in that case the next if branch
|
||||||
MUST be executed - and it would not if there was "else" */
|
MUST be executed - and it would not if there was "else" */
|
||||||
{
|
{
|
||||||
afmName = wxINSTALL_PREFIX;
|
afmName = wxGetInstallPrefix();
|
||||||
afmName << wxFILE_SEP_PATH
|
afmName << wxFILE_SEP_PATH
|
||||||
<< wxT("share") << wxFILE_SEP_PATH
|
<< wxT("share") << wxFILE_SEP_PATH
|
||||||
<< wxT("wx") << wxFILE_SEP_PATH
|
<< wxT("wx") << wxFILE_SEP_PATH
|
||||||
|
Reference in New Issue
Block a user