define _TM_DEFINED if we define struct tm here

[wxWidgets.git] / include / wx / msw / colour.h

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index d9bcb9319d00ad204182fb7cb614d5fbbb2e274a..4b40ce3fdadc2b21310bfcf7f0d7178731ddcb38 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -12,17 +12,13 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "colour.h"
-#endif
-
 #include "wx/object.h"
 
 // ----------------------------------------------------------------------------
 // Colour
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColour : public wxObject
+class WXDLLEXPORT wxColour : public wxColourBase
 {
 public:
     // constructors
@@ -30,45 +26,13 @@ public:
 
     // default
     wxColour() { Init(); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-
-    // from packed RGB
-    wxColour( unsigned long colRGB ) { Set(colRGB); }
-
-    // implicit conversion from the colour name
-    wxColour(const wxString &colourName) { InitFromName(colourName); }
-    wxColour(const wxChar *colourName) { InitFromName(colourName); }
-
-
-    // copy ctors and assignment operators
-    wxColour(const wxColour& col);
-    wxColour& operator=( const wxColour& col);
 
     // dtor
     ~wxColour();
 
 
-    // other methods
-    // -------------
-
-    // to have the matching Create also for this class
-    void Create( unsigned char red, unsigned char green, unsigned char blue )
-    { Set(red, green, blue); }
-
-    // Set() functions
-    void Set(unsigned char red, unsigned char green, unsigned char blue);
-    void Set(unsigned long colRGB)
-    {
-        // we don't need to know sizeof(long) here because we assume that the three
-        // least significant bytes contain the R, G and B values
-        Set((unsigned char)colRGB,
-            (unsigned char)(colRGB >> 8),
-            (unsigned char)(colRGB >> 16));
-    }
-
     // accessors
     // ---------
 
@@ -91,7 +55,6 @@ public:
 
     WXCOLORREF GetPixel() const { return m_pixel; };
 
-    void InitFromName(const wxString& colourName);
 
 public:
     WXCOLORREF m_pixel;
@@ -100,6 +63,8 @@ protected:
     // Helper function
     void Init();
 
+    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue);
+
 private:
     bool          m_isInit;
     unsigned char m_red;