added wxUSE_INICONF (disabled by default)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 9403903cb381ef4e90fe76a5ea61ed86d3f73864..150196ad35300024e3bed232d8a9c648c1e25c87 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 47734 2007-07-26 16:27:29Z VZ .
+# From configure.in Id: configure.in 47742 2007-07-27 03:38:33Z DE .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #


@@ -1847,6 +1847,7 @@ Optional Features:
   --enable-xpm            use xpm images (XPM file format)
   --enable-icocur         use Windows ICO and CUR formats
   --enable-dccache        cache temporary wxDC objects (Win32 only)
   --enable-xpm            use xpm images (XPM file format)
   --enable-icocur         use Windows ICO and CUR formats
   --enable-dccache        cache temporary wxDC objects (Win32 only)

+

   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
   --enable-ownerdrawn     use owner drawn controls (Win32 only)
   --enable-regkey         use wxRegKey class (Win32 only)
   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
   --enable-ownerdrawn     use owner drawn controls (Win32 only)
   --enable-regkey         use wxRegKey class (Win32 only)


@@ -15581,6 +15582,60 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+          enablestring=
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-... $ECHO_C" >&6; }
+          # Check whether --enable- was given.
+if test "${enable_+set}" = set; then
+  enableval=$enable_;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_='=yes'
+                          else
+                            wx_cv_use_='=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_='=${'DEFAULT_":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_"
+          if test "x$cache" = xyes; then
+            echo "=$" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $ = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+         (iniconf,       --enable-iniconf        use wxIniConfig (Win32 only), wxUSE_INICONF)
+

           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then


@@ -49342,6 +49397,13 @@ _ACEOF
 
 fi
 
 
 fi
 

+if test "$wxUSE_INICONF" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INICONF 1
+_ACEOF
+
+fi
+

 if test "$wxUSE_DIB" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_WXDIB 1
 if test "$wxUSE_DIB" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_WXDIB 1

diff --git a/configure.in b/configure.in
index cb74a99908e93239bb8474e8c313eb44f967fd2a..36a6f3da8a4f380b7b867948c9ee0ce2c9db9fbb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -934,6 +934,7 @@ dnl wxMSW-only options
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_FEATURE(dccache,     [  --enable-dccache        cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_FEATURE(dccache,     [  --enable-dccache        cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)

+WX_ARG_ENABLE (iniconf,     [  --enable-iniconf        use wxIniConfig (Win32 only)], wxUSE_INICONF)

 WX_ARG_FEATURE(ps-in-msw,   [  --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)], wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 WX_ARG_FEATURE(ownerdrawn,  [  --enable-ownerdrawn     use owner drawn controls (Win32 only)], wxUSE_OWNER_DRAWN)
 WX_ARG_FEATURE(regkey,      [  --enable-regkey         use wxRegKey class (Win32 only)], wxUSE_REGKEY)
 WX_ARG_FEATURE(ps-in-msw,   [  --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)], wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 WX_ARG_FEATURE(ownerdrawn,  [  --enable-ownerdrawn     use owner drawn controls (Win32 only)], wxUSE_OWNER_DRAWN)
 WX_ARG_FEATURE(regkey,      [  --enable-regkey         use wxRegKey class (Win32 only)], wxUSE_REGKEY)


@@ -7224,6 +7225,10 @@ if test "$wxUSE_DC_CACHEING" = "yes"; then
     AC_DEFINE(wxUSE_DC_CACHEING)
 fi
 
     AC_DEFINE(wxUSE_DC_CACHEING)
 fi
 

+if test "$wxUSE_INICONF" = "yes"; then
+    AC_DEFINE(wxUSE_INICONF)
+fi
+

 if test "$wxUSE_DIB" = "yes"; then
     AC_DEFINE(wxUSE_WXDIB)
 fi
 if test "$wxUSE_DIB" = "yes"; then
     AC_DEFINE(wxUSE_WXDIB)
 fi

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 2c088a7bf4815e314bcf8eec9cb633a33fa6b5bb..59d5dbc43304925213eb5ab5048150dc914e830a 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -55,6 +55,14 @@
 #    endif
 #endif /* !defined(wxUSE_MS_HTML_HELP) */
 
 #    endif
 #endif /* !defined(wxUSE_MS_HTML_HELP) */
 

+#ifndef wxUSE_INICONF
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_INICONF must be defined."
+#    else
+#        define wxUSE_INICONF 0
+#    endif
+#endif /* !defined(wxUSE_INICONF) */
+

 #ifndef wxUSE_OLE
 #    ifdef wxABORT_ON_CONFIG_ERROR
 #        error "wxUSE_OLE must be defined."
 #ifndef wxUSE_OLE
 #    ifdef wxABORT_ON_CONFIG_ERROR
 #        error "wxUSE_OLE must be defined."

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index e0ee004ca99ea7fb69f8c192dcbaf30e8b058364..5eca7ba7afa1da7729ee4cad853db58942e0776e 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -9,8 +9,10 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef   _INICONF_H
-#define   _INICONF_H
+#ifndef   _WX_MSW_INICONF_H_
+#define   _WX_MSW_INICONF_H_
+
+#if wxUSE_INICONF

 
 // ----------------------------------------------------------------------------
 // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to
 
 // ----------------------------------------------------------------------------
 // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to


@@ -97,4 +99,6 @@ private:
   DECLARE_ABSTRACT_CLASS(wxIniConfig)
 };
 
   DECLARE_ABSTRACT_CLASS(wxIniConfig)
 };
 

-#endif  //_INICONF_H
+#endif // wxUSE_INICONF
+
+#endif  //_WX_MSW_INICONF_H_

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 5636e5f35c1fd87f55a0059b3ceae9bf853ebaad..6e2a8de39816d303abaff7434911eae9aa2d4615 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1352,6 +1352,13 @@
 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 
 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 

+// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
+//
+// Default is 0.
+//
+// Recommended setting: 0, nobody uses .INI files any more
+#define wxUSE_INICONF 0
+

 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h
index 322a9da473cb45a045baa85fb02506bf38212bab..c4bc19fe150fe4ed6ba1f03a2689b431a5a754db 100644 (file)
--- a/include/wx/msw/setup_inc.h
+++ b/include/wx/msw/setup_inc.h
@@ -116,6 +116,13 @@
 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 
 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 

+// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
+//
+// Default is 0.
+//
+// Recommended setting: 0, nobody uses .INI files any more
+#define wxUSE_INICONF 0
+

 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------

diff --git a/setup.h.in b/setup.h.in
index 264fc58d6f3eae00d26c90bc7e071418452fac8e..c074f66f5b404342f891977e98cc390bfafb8084 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -591,6 +591,8 @@
 
 #define wxUSE_INKEDIT  0
 
 
 #define wxUSE_INKEDIT  0
 

+#define wxUSE_INICONF 0
+

 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 8a97072e4be914469b198baea61f8e0373e0de1c..b56e88db4adbc285e39f9d624d7c69f083428165 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_CONFIG
+#if wxUSE_INICONF

 
 #ifndef   WX_PRECOMP
     #include "wx/msw/wrapwin.h"
 
 #ifndef   WX_PRECOMP
     #include "wx/msw/wrapwin.h"


@@ -471,4 +471,4 @@ bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
     return false;
 }
 
     return false;
 }
 

-#endif // wxUSE_CONFIG
+#endif // wxUSE_INICONF