* Some more CopyObject()

[wxWidgets.git] / include / wx / confbase.h

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index e849917ffb47e8d303f1ae51606ee1fc50efc728..7e6cfeacf2dfc7406a1bb90a80d785d1ce58b97f 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -53,8 +53,12 @@
 #endif
 
 // Style flags for constructor style parameter
 #endif
 
 // Style flags for constructor style parameter

-#define wxCONFIG_USE_LOCAL_FILE         1
-#define wxCONFIG_USE_GLOBAL_FILE        2
+enum
+{
+    wxCONFIG_USE_LOCAL_FILE = 1,
+    wxCONFIG_USE_GLOBAL_FILE = 2,
+    wxCONFIG_USE_RELATIVE_PATH = 4
+};

 
 // ----------------------------------------------------------------------------
 // various helper global functions
 
 // ----------------------------------------------------------------------------
 // various helper global functions


@@ -70,7 +74,7 @@ extern 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 char *sz);
+extern void wxSplitPath(wxArrayString& aParts, const wxChar *sz);

 
 // ----------------------------------------------------------------------------
 // abstract base class wxConfigBase which defines the interface for derived
 
 // ----------------------------------------------------------------------------
 // abstract base class wxConfigBase which defines the interface for derived


@@ -81,7 +85,7 @@ extern void wxSplitPath(wxArrayString& aParts, const char *sz);
 // There is always one current group given by the current path.
 //
 // Keys are pairs "key_name = value" where value may be of string or integer
 // There is always one current group given by the current path.
 //
 // Keys are pairs "key_name = value" where value may be of string or integer

-// (long) type (@@@ doubles and other types such as wxDate coming soon).
+// (long) type (TODO doubles and other types such as wxDate coming soon).

 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxConfigBase
 {
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxConfigBase
 {


@@ -111,7 +115,9 @@ public:
     // should Get() try to create a new log object if the current one is NULL?
   static void DontCreateOnDemand() { ms_bAutoCreate = FALSE; }
 
     // should Get() try to create a new log object if the current one is NULL?
   static void DontCreateOnDemand() { ms_bAutoCreate = FALSE; }
 

-  // ctors & virtual dtor
+  // ctor & virtual dtor
+      // ctor (can be used as default ctor too)
+      //

       // Not all args will always be used by derived classes, but including
       // them all in each class ensures compatibility. If appName is empty,
       // uses wxApp name
       // Not all args will always be used by derived classes, but including
       // them all in each class ensures compatibility. If appName is empty,
       // uses wxApp name


@@ -235,11 +241,6 @@ 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; }
 

-  virtual void SetAppName(const wxString& appName)
-    { m_appName = appName; }
-  virtual 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; }