provide overloads for all kinds of strings for wxDataFormat ctor to allow passing...

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 698e94b895dc9448e0c910e5b971365dabe95ddb..bccafa801eafca7ca91323ec059211648c482347 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -11,11 +11,12 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _WX_CONFBASE_H_
-#define   _WX_CONFBASE_H_
+#ifndef _WX_CONFBASE_H_
+#define _WX_CONFBASE_H_
 
 #include "wx/defs.h"
 #include "wx/string.h"
+#include "wx/object.h"
 
 class WXDLLIMPEXP_BASE wxArrayString;
 
@@ -72,7 +73,7 @@ enum
 // (long) type (TODO doubles and other types such as wxDate coming soon).
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxConfigBase
+class WXDLLIMPEXP_BASE wxConfigBase : public wxObject
 {
 public:
   // constants
@@ -295,6 +296,8 @@ private:
 
   // Style flag
   long              m_style;
+
+  DECLARE_ABSTRACT_CLASS(wxConfigBase)
 };
 
 // a handy little class which changes current path to the path of given entry
@@ -357,7 +360,5 @@ WXDLLIMPEXP_BASE wxString wxExpandEnvVars(const wxString &sz);
  */
 WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
 
-
-#endif
-  // _WX_CONFIG_H_
+#endif // _WX_CONFBASE_H_