added wxTo/FromString(wxColour) (part of patch 1753875)

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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index f64ca4c51f91be99bfc7d5c91e65a9712418b91d..0083ee158598cd98f8aaee34c82e9934b7cb621e 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -805,7 +805,8 @@ inline double wxStrtod(const wxString& nptr, T endptr)
         // note that it is important to use c_str() here and not mb_str() or
         // wc_str(), because we store the pointer into (possibly converted)
         // buffer in endptr and so it must be valid even when wxStrtod() returns
         // note that it is important to use c_str() here and not mb_str() or
         // wc_str(), because we store the pointer into (possibly converted)
         // buffer in endptr and so it must be valid even when wxStrtod() returns

-        return wxStrtod((typename wxStrtoxCharType<T>::Type)nptr.c_str(),
+        typedef typename wxStrtoxCharType<T>::Type CharType;
+        return wxStrtod((CharType)nptr.c_str(),

                         wxStrtoxCharType<T>::AsPointer(endptr));
     }
 }
                         wxStrtoxCharType<T>::AsPointer(endptr));
     }
 }


@@ -829,9 +830,12 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
         if ( endptr == 0 )                                                    \
             return name(nptr.wx_str(), (wxStringCharType**)NULL, base);       \
         else                                                                  \
         if ( endptr == 0 )                                                    \
             return name(nptr.wx_str(), (wxStringCharType**)NULL, base);       \
         else                                                                  \

-            return name((typename wxStrtoxCharType<T>::Type)nptr.c_str(),     \
+        {                                                                     \
+            typedef typename wxStrtoxCharType<T>::Type CharType;              \
+            return name((CharType)nptr.c_str(),                               \

                         wxStrtoxCharType<T>::AsPointer(endptr),               \
                         base);                                                \
                         wxStrtoxCharType<T>::AsPointer(endptr),               \
                         base);                                                \

+        }                                                                     \

     }                                                                         \
     template<typename T>                                                      \
     inline rettype name(const wxCStrData& nptr, T endptr, int base)           \
     }                                                                         \
     template<typename T>                                                      \
     inline rettype name(const wxCStrData& nptr, T endptr, int base)           \