fix printf() argument type in GetOsInfo()

[wxWidgets.git] / src / palmos / colour.cpp

diff --git a/src/palmos/colour.cpp b/src/palmos/colour.cpp
index a7581c47285edd3eb41a2a592a47e3f3656d0d2c..73a0a66c7446fac36f7c9beff9ce85439d2b12b4 100644 (file)
--- a/src/palmos/colour.cpp
+++ b/src/palmos/colour.cpp
@@ -9,19 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/colour.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/gdicmn.h"
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
 #include <string.h>
 
@@ -29,28 +28,17 @@
 
 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
-    // copied from VS xrc
-    unsigned long tmp = 0;
-
-    if (s.Length() != 7 || s[0u] != wxT('#')
-        || wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+    if ( !data.Set(s) )
     {
         wxLogError(_("String To Colour : Incorrect colour specification : %s"),
             s.c_str() );
         data = wxNullColour;
     }
-    else
-    {
-        data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
-            (unsigned char) ((tmp & 0x00FF00) >> 8),
-            (unsigned char) ((tmp & 0x0000FF)));
-    }
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {
-    s = wxString::Format(wxT("#%02X%02X%02X"),
-        data.Red(), data.Green(), data.Blue() );
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);
 }
 
 wxTO_STRING_IMP( wxColour )
@@ -98,17 +86,14 @@ wxColour& wxColour::operator=(const wxColour& col)
     return *this;
 }
 
-void wxColour::InitFromName(const wxString& name)
-{
-    // leave invalid
-    Init();
-}
-
 wxColour::~wxColour()
 {
 }
 
-void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
 {
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_isInit = true;
 }
-