changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index a52b72239cdd6617e278a3878204ea359fcfaf6b..58f4bf23800fea1241f40ea713bffca4aa60fc37 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -79,7 +79,9 @@ public:
     wxVariant();
     wxVariant(double val, const wxString& name = g_szNul);
     wxVariant(long val, const wxString& name = g_szNul);
     wxVariant();
     wxVariant(double val, const wxString& name = g_szNul);
     wxVariant(long val, const wxString& name = g_szNul);

+#ifdef HAVE_BOOL

     wxVariant(bool val, const wxString& name = g_szNul);
     wxVariant(bool val, const wxString& name = g_szNul);

+#endif

     wxVariant(char val, const wxString& name = g_szNul);
     wxVariant(const wxString& val, const wxString& name = g_szNul);
     wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!
     wxVariant(char val, const wxString& name = g_szNul);
     wxVariant(const wxString& val, const wxString& name = g_szNul);
     wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!


@@ -114,9 +116,11 @@ public:
     bool operator== (char value) const;
     bool operator!= (char value) const;
     void operator= (char value) ;
     bool operator== (char value) const;
     bool operator!= (char value) const;
     void operator= (char value) ;

+#ifdef HAVE_BOOL

     bool operator== (bool value) const;
     bool operator!= (bool value) const;
     void operator= (bool value) ;
     bool operator== (bool value) const;
     bool operator!= (bool value) const;
     void operator= (bool value) ;

+#endif

     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;