continue with other handlers if some handler fails in LoadFile() after returning...

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

diff --git a/include/wx/config.h b/include/wx/config.h
index 2028c217ae935773c21eaa173f42c2d9962558cb..ddbbbe2f47f508ce4a45387a4ca9cadd00810efd 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        config.h
 // Purpose:     wxConfig base header
 /////////////////////////////////////////////////////////////////////////////
 // Name:        config.h
 // Purpose:     wxConfig base header

-// Author:      wxWidgets Team
+// Author:      Julian Smart

 // Modified by:
 // Created:
 // Modified by:
 // Created:

-// Copyright:   (c) wxWidgets Team
+// Copyright:   (c) Julian Smart

 // RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -15,17 +15,24 @@
 #include "wx/defs.h"
 #include "wx/confbase.h"
 
 #include "wx/defs.h"
 #include "wx/confbase.h"
 

+// ----------------------------------------------------------------------------
+// define the native wxConfigBase implementation
+// ----------------------------------------------------------------------------
+
+// under Windows we prefer to use the native implementation but can be forced
+// to use the file-based one

 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE

-#    ifdef __WIN32__
-#        include "wx/msw/regconf.h"
-#    else
-#        include "wx/msw/iniconf.h"
-#    endif
+    #include "wx/msw/regconf.h"
+    #define wxConfig  wxRegConfig
+#elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
+    #include "wx/os2/iniconf.h"
+    #define wxConfig wxIniConfig

 #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
 #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE

-#    include "wx/palmos/prefconf.h"
-#else
-#    include "wx/fileconf.h"
+    #include "wx/palmos/prefconf.h"
+    #define wxConfig wxPrefConfig
+#else // either we're under Unix or wish to always use config files
+    #include "wx/fileconf.h"
+    #define wxConfig wxFileConfig

 #endif
 
 #endif
 

-#endif
-    // _WX_CONFIG_H_BASE_
+#endif // _WX_CONFIG_H_BASE_