Removed some consts from tabctrl.h; fixed some other errors

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

diff --git a/include/wx/config.h b/include/wx/config.h
index 07ddc77804cd14d894c21a2dec73545c85b90789..f9eab1d2a9eba58f22150c88e1bc3de7627111fc 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,6 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        
-// Purpose:     
+// Name:        config.h
+// Purpose:     declaration of the base class of all config implementations
+//              (see also: fileconf.h and msw/regconf.h)

 // Author:      Karsten Ballüder & Vadim Zeitlin
 // Modified by: 
 // Created:     07.04.98 (adapted from appconf.h)
 // Author:      Karsten Ballüder & Vadim Zeitlin
 // Modified by: 
 // Created:     07.04.98 (adapted from appconf.h)


@@ -13,13 +14,22 @@
 #ifndef   _APPCONF_H
 #define   _APPCONF_H
 
 #ifndef   _APPCONF_H
 #define   _APPCONF_H
 

+// ----------------------------------------------------------------------------
+// compile options
+// ----------------------------------------------------------------------------
+
+// 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
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 /// shall we be case sensitive in parsing variable names?
 #ifndef APPCONF_CASE_SENSITIVE
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 /// shall we be case sensitive in parsing variable names?
 #ifndef APPCONF_CASE_SENSITIVE

-  #define  APPCONF_CASE_SENSITIVE       false
+  #define  APPCONF_CASE_SENSITIVE       FALSE

 #endif
 
 /// separates group and entry names
 #endif
 
 /// separates group and entry names


@@ -34,7 +44,7 @@
 
 /// should we use registry instead of configuration files under Win32?
 #ifndef   APPCONF_WIN32_NATIVE
 
 /// should we use registry instead of configuration files under Win32?
 #ifndef   APPCONF_WIN32_NATIVE

-  #define APPCONF_WIN32_NATIVE          true
+  #define APPCONF_WIN32_NATIVE          TRUE

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -114,13 +124,13 @@ public:
   virtual bool Write(const char *szKey, const char *szValue) = 0;
   virtual bool Write(const char *szKey, long lValue) = 0;
     // permanently writes all changes
   virtual bool Write(const char *szKey, const char *szValue) = 0;
   virtual bool Write(const char *szKey, long lValue) = 0;
     // permanently writes all changes

-  virtual bool Flush(bool bCurrentOnly = false) = 0;
+  virtual bool Flush(bool bCurrentOnly = FALSE) = 0;

 
   // delete entries/groups
     // deletes the specified entry and the group it belongs to if
     // it was the last key in it and the second parameter is true
   virtual bool DeleteEntry(const char *szKey,
 
   // delete entries/groups
     // deletes the specified entry and the group it belongs to if
     // it was the last key in it and the second parameter is true
   virtual bool DeleteEntry(const char *szKey,

-                           bool bDeleteGroupIfEmpty = true) = 0;
+                           bool bDeleteGroupIfEmpty = TRUE) = 0;

     // delete the group (with all subgroups)
   virtual bool DeleteGroup(const char *szKey) = 0;
     // delete the whole underlying object (disk file, registry key, ...)
     // delete the group (with all subgroups)
   virtual bool DeleteGroup(const char *szKey) = 0;
     // delete the whole underlying object (disk file, registry key, ...)