More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index ae259b88ec69f27eb6523e140b1505cb1a783455..af05537a6ce793f02600a247932b10709b8a2354 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -23,9 +23,9 @@
 // ----------------------------------------------------------------------------
 
 // it won't compile without it anyhow
-#ifndef USE_WXCONFIG
-  #error "Please define USE_WXCONFIG or remove config.cpp from your makefile"
-#endif // USE_WXCONFIG
+#ifndef wxUSE_CONFIG
+  #error "Please define wxUSE_CONFIG or remove config.cpp from your makefile"
+#endif // wxUSE_CONFIG
 
 // ----------------------------------------------------------------------------
 // constants
@@ -112,9 +112,9 @@ public:
   // 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
-  wxConfigBase(const wxString& appName = wxEmptyString, const wxString& vendorName = wxEmptyString,
-    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString,
-    long style = 0);
+  wxConfigBase(const wxString& appName = "", const wxString& vendorName = "",
+               const wxString& localFilename = "", const wxString& globalFilename = "",
+               long style = 0);
 
     // empty but ensures that dtor of all derived classes is virtual
   virtual ~wxConfigBase() { }
@@ -155,7 +155,7 @@ public:
   virtual bool Read(const wxString& key, wxString *pStr) const = 0;
   virtual bool Read(const wxString& key, wxString *pStr, const wxString& defVal) const;
 
-  virtual wxString Read(const wxString& key, const wxString& defVal) const;
+  virtual wxString Read(const wxString& key, const wxString& defVal = "") const;
 
   virtual bool Read(const wxString& key, long *pl) const = 0;
   virtual bool Read(const wxString& key, long *pl, long defVal) const;
@@ -220,7 +220,7 @@ public:
   inline void SetAppName(const wxString& appName) { m_appName = appName; }
   inline void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
 
-  inline void SetStyle(long style) { m_style; }
+  inline void SetStyle(long style) { m_style = style; }
   inline long GetStyle() const { return m_style; }
 
 protected:
@@ -276,14 +276,14 @@ private:
 #if defined(__WXMSW__) && wxCONFIG_WIN32_NATIVE
   #ifdef __WIN32__
     #define wxConfig  wxRegConfig
-    #define classwxConfig classwxRegConfig
+    #define sm_classwxConfig sm_classwxRegConfig
   #else  //WIN16
     #define wxConfig  wxIniConfig
-    #define classwxConfig classwxIniConfig
+    #define sm_classwxConfig sm_classwxIniConfig
   #endif
 #else // either we're under Unix or wish to use files even under Windows
   #define wxConfig  wxFileConfig
-  #define classwxConfig classwxFileConfig
+  #define sm_classwxConfig sm_classwxFileConfig
 #endif