1. some more of "#if wxUSE_XXX" here and there
2. Makefile fixes for Cygwin compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,22 +60,6 @@ enum
|
||||
wxCONFIG_USE_RELATIVE_PATH = 4
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// various helper global functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
Replace environment variables ($SOMETHING) with their values. The format is
|
||||
$VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
|
||||
'_' only. '$' must be escaped ('\$') in order to be taken literally.
|
||||
*/
|
||||
extern wxString wxExpandEnvVars(const wxString &sz);
|
||||
|
||||
/*
|
||||
Split path into parts removing '..' in progress
|
||||
*/
|
||||
extern void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// abstract base class wxConfigBase which defines the interface for derived
|
||||
// classes
|
||||
@@ -311,9 +295,23 @@ private:
|
||||
#define sm_classwxConfig sm_classwxFileConfig
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif // wxUSE_CONFIG
|
||||
|
||||
// wxUSE_CONFIG
|
||||
// ----------------------------------------------------------------------------
|
||||
// various helper global functions (defined even if !wxUSE_CONFIG)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
Replace environment variables ($SOMETHING) with their values. The format is
|
||||
$VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
|
||||
'_' only. '$' must be escaped ('\$') in order to be taken literally.
|
||||
*/
|
||||
extern wxString wxExpandEnvVars(const wxString &sz);
|
||||
|
||||
/*
|
||||
Split path into parts removing '..' in progress
|
||||
*/
|
||||
extern void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
|
||||
|
||||
#endif
|
||||
// _WX_CONFIG_H_
|
||||
|
Reference in New Issue
Block a user