another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 91871da380e1762fe05e7ca2d6ce2143cf6f920d..32ecdde96203f37768849f38e1074e873f96fcfa 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -52,6 +52,14 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 

+// not all compilers can deal with template Read/Write() methods, define this
+// symbol if the template functions are available
+#if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
+    !defined( __VMS ) && \
+    !defined (__DMC__)
+    #define wxHAS_CONFIG_TEMPLATE_RW
+#endif
+

 // Style flags for constructor style parameter
 enum
 {
 // Style flags for constructor style parameter
 enum
 {


@@ -185,8 +193,7 @@ public:
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 

-  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
-#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) && !defined (__DMC__))
+#ifdef wxHAS_CONFIG_TEMPLATE_RW

   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const
   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const


@@ -209,7 +216,7 @@ public:
       }
       return found;
   }
       }
       return found;
   }

-#endif
+#endif // wxHAS_CONFIG_TEMPLATE_RW

 
   // convenience functions returning directly the value 
   wxString Read(const wxString& key,
 
   // convenience functions returning directly the value 
   wxString Read(const wxString& key,