Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / common / colourcmn.cpp

diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 965fbdcff07422f07f22ad001503807b331db824..013b17cee3150d38101b654763dc08bdd17b8229 100644 (file)
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -128,7 +128,7 @@ bool wxColourBase::FromString(const wxString& str)
             // passed as first argument: if it is a wide string, then %c
             // expects "wchar_t *" matching parameter under MSW for example.
             if ( sscanf(str.c_str() + 4,
             // passed as first argument: if it is a wide string, then %c
             // expects "wchar_t *" matching parameter under MSW for example.
             if ( sscanf(str.c_str() + 4,

-                        formatStr,
+                        formatStr.mb_str(),

                         &red, &green, &blue, alphaPtr) != 4 )
                 return false;
 
                         &red, &green, &blue, alphaPtr) != 4 )
                 return false;
 


@@ -177,13 +177,13 @@ bool wxColourBase::FromString(const wxString& str)
         // because this place can be called from constructor
         // and 'this' could not be available yet
         wxColour clr = wxTheColourDatabase->Find(str);
         // because this place can be called from constructor
         // and 'this' could not be available yet
         wxColour clr = wxTheColourDatabase->Find(str);

-        if (clr.Ok())
+        if (clr.IsOk())

             Set((unsigned char)clr.Red(),
                 (unsigned char)clr.Green(),
                 (unsigned char)clr.Blue());
     }
 
             Set((unsigned char)clr.Red(),
                 (unsigned char)clr.Green(),
                 (unsigned char)clr.Blue());
     }
 

-    if (Ok())
+    if (IsOk())

         return true;
 
     wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str);
         return true;
 
     wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str);