projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMac merge
[wxWidgets.git]
/
include
/
wx
/
confbase.h
diff --git
a/include/wx/confbase.h
b/include/wx/confbase.h
index 46336d3d6551188246001bc04f4d3c1e5fe0d6c5..936e22190cd27e944d9416e30b095db2d1cdcdc3 100644
(file)
--- a/
include/wx/confbase.h
+++ b/
include/wx/confbase.h
@@
-35,21
+35,21
@@
/// separates group and entry names (probably shouldn't be changed)
#ifndef wxCONFIG_PATH_SEPARATOR
/// separates group and entry names (probably shouldn't be changed)
#ifndef wxCONFIG_PATH_SEPARATOR
- #define wxCONFIG_PATH_SEPARATOR
'/'
+ #define wxCONFIG_PATH_SEPARATOR
_T('/')
#endif
/// introduces immutable entries
// (i.e. the ones which can't be changed from the local config file)
#ifndef wxCONFIG_IMMUTABLE_PREFIX
#endif
/// introduces immutable entries
// (i.e. the ones which can't be changed from the local config file)
#ifndef wxCONFIG_IMMUTABLE_PREFIX
- #define wxCONFIG_IMMUTABLE_PREFIX
'!'
+ #define wxCONFIG_IMMUTABLE_PREFIX
_T('!')
#endif
#endif
-/// should we use registry instead of configuration files under Win
32
?
+/// should we use registry instead of configuration files under Win
dows
?
// (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
// FALSE) or wxRegConfig (if it's true and we're under Win32) or wxIniConfig
// (under Win16))
// (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
// FALSE) or wxRegConfig (if it's true and we're under Win32) or wxIniConfig
// (under Win16))
-#ifndef wx
CONFIG_WIN32
_NATIVE
- #define wx
CONFIG_WIN32_NATIVE TRUE
+#ifndef wx
USE_CONFIG
_NATIVE
+ #define wx
USE_CONFIG_NATIVE 1
#endif
// Style flags for constructor style parameter
#endif
// Style flags for constructor style parameter
@@
-90,10
+90,11
@@
public:
static wxConfigBase *Set(wxConfigBase *pConfig);
// get the config object, creates it on demand unless DontCreateOnDemand
// was called
static wxConfigBase *Set(wxConfigBase *pConfig);
// get the config object, creates it on demand unless DontCreateOnDemand
// was called
- static wxConfigBase *Get() { if ( !ms_pConfig ) Create(); return ms_pConfig; }
+ static wxConfigBase *Get(bool createOnDemand = TRUE)
+ { if ( createOnDemand && (!ms_pConfig) ) Create(); return ms_pConfig; }
// create a new config object: this function will create the "best"
// implementation of wxConfig available for the current platform, see
// create a new config object: this function will create the "best"
// implementation of wxConfig available for the current platform, see
- // comments near definition wx
CONFIG_WIN32
_NATIVE for details. It returns
+ // comments near definition wx
USE_CONFIG
_NATIVE for details. It returns
// the created object and also sets it as ms_pConfig.
static wxConfigBase *Create();
// should Get() try to create a new log object if the current one is NULL?
// the created object and also sets it as ms_pConfig.
static wxConfigBase *Create();
// should Get() try to create a new log object if the current one is NULL?
@@
-112,7
+113,7
@@
public:
long style = 0);
// empty but ensures that dtor of all derived classes is virtual
long style = 0);
// empty but ensures that dtor of all derived classes is virtual
- virtual ~wxConfigBase()
{ }
+ virtual ~wxConfigBase()
;
// path management
// set current path: if the first character is '/', it's the absolute path,
// path management
// set current path: if the first character is '/', it's the absolute path,
@@
-226,6
+227,10
@@
public:
wxString GetAppName() const { return m_appName; }
wxString GetVendorName() const { return m_vendorName; }
wxString GetAppName() const { return m_appName; }
wxString GetVendorName() const { return m_vendorName; }
+ // Used wxIniConfig to set members in constructor
+ void SetAppName(const wxString& appName) { m_appName = appName; }
+ void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
+
void SetStyle(long style) { m_style = style; }
long GetStyle() const { return m_style; }
void SetStyle(long style) { m_style = style; }
long GetStyle() const { return m_style; }
@@
-279,7
+284,7
@@
private:
// ----------------------------------------------------------------------------
// under Windows we prefer to use the native implementation
// ----------------------------------------------------------------------------
// under Windows we prefer to use the native implementation
-#if defined(__WXMSW__) && wx
CONFIG_WIN32
_NATIVE
+#if defined(__WXMSW__) && wx
USE_CONFIG
_NATIVE
#ifdef __WIN32__
#define wxConfig wxRegConfig
#define sm_classwxConfig sm_classwxRegConfig
#ifdef __WIN32__
#define wxConfig wxRegConfig
#define sm_classwxConfig sm_classwxRegConfig
@@
-303,12
+308,12
@@
private:
$VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
'_' only. '$' must be escaped ('\$') in order to be taken literally.
*/
$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);
+extern
WXDLLEXPORT
wxString wxExpandEnvVars(const wxString &sz);
/*
Split path into parts removing '..' in progress
*/
/*
Split path into parts removing '..' in progress
*/
-extern void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
+extern
WXDLLEXPORT
void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
#endif
// _WX_CONFIG_H_
#endif
// _WX_CONFIG_H_