add a critical section protecting ms_prev variables (replaces patch 1819224)

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

diff --git a/include/wx/config.h b/include/wx/config.h
index 41afd94b018314fb8f82ff355fdae61438b274a2..2cd571dae6d48ebecab54174cb47aa5f68f649e2 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,14 +1,28 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 

+#include "wx/defs.h"

 #include "wx/confbase.h"
 
 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
 #include "wx/confbase.h"
 
 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE

-#  ifdef __WIN32__
-#    include "wx/msw/regconf.h"
-#else
-#    include "wx/msw/iniconf.h"
-#  endif
+#    ifdef __WIN32__
+#        include "wx/msw/regconf.h"
+#    else
+#        include "wx/msw/iniconf.h"
+#    endif
+#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
+#    include "wx/palmos/prefconf.h"

 #else
 #    include "wx/fileconf.h"
 #endif
 #else
 #    include "wx/fileconf.h"
 #endif