moved definition of TARGET_CARBON to generated setup.h when compiling with

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index fbd1e57a132cd6c4ccbaa960ca0880ac7af98b6b..ba65608a01624b56ac2fa50a7ff2330de0e7f47e 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -14,7 +14,7 @@
 #ifndef   _WX_CONFBASE_H_
 #define   _WX_CONFBASE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "confbase.h"
 #endif
 
@@ -27,7 +27,7 @@
 
 /// shall we be case sensitive in parsing variable names?
 #ifndef wxCONFIG_CASE_SENSITIVE
-  #define  wxCONFIG_CASE_SENSITIVE       FALSE
+  #define  wxCONFIG_CASE_SENSITIVE       0
 #endif
 
 /// separates group and entry names (probably shouldn't be changed)
@@ -58,7 +58,8 @@ enum
 {
     wxCONFIG_USE_LOCAL_FILE = 1,
     wxCONFIG_USE_GLOBAL_FILE = 2,
-    wxCONFIG_USE_RELATIVE_PATH = 4
+    wxCONFIG_USE_RELATIVE_PATH = 4,
+    wxCONFIG_USE_NO_ESCAPE_CHARACTERS = 8
 };
 
 // ----------------------------------------------------------------------------
@@ -306,6 +307,8 @@ private:
   wxString      m_strName,      // name of entry (i.e. name only)
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
+
+    DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
 };