Deprecate second parameter of wxSlider::SetTickFreq().

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

diff --git a/include/wx/config.h b/include/wx/config.h
index e6275cb52ef1e0aa4c14bc9d8f771b7fb9cfff71..e8734bf25d51c19180cc0771767c574f9092428f 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,19 +1,41 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        config.h
+// Purpose:     wxConfig base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
 #include "wx/confbase.h"
 
+#if wxUSE_CONFIG
+
+// ----------------------------------------------------------------------------
+// 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
-#    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
-#    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
-    // _WX_CONFIG_H_BASE_
+#endif // wxUSE_CONFIG
+
+#endif // _WX_CONFIG_H_BASE_