added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 30481cba51c5c17ec4c11ee683d8c9000d1a9835..357d8657d31aedb9011cb3be3715f07d392e6fed 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -37,11 +37,11 @@ class wxColour;
 // wxColour
 //-----------------------------------------------------------------------------
 
 // wxColour
 //-----------------------------------------------------------------------------
 

-class wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour: public wxGDIObject

 {
 public:
     wxColour() { }
 {
 public:
     wxColour() { }

-  
+

     // Construct from RGB
     wxColour( unsigned char red, unsigned char green, unsigned char blue );
     wxColour( unsigned long colRGB ) { Set(colRGB); }
     // Construct from RGB
     wxColour( unsigned char red, unsigned char green, unsigned char blue );
     wxColour( unsigned long colRGB ) { Set(colRGB); }


@@ -62,7 +62,7 @@ public:
     ~wxColour();
 
     bool Ok() const { return m_refData != NULL; }
     ~wxColour();
 
     bool Ok() const { return m_refData != NULL; }

-  
+

     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 


@@ -81,18 +81,18 @@ public:
     unsigned char Blue() const;
 
     // Implementation part
     unsigned char Blue() const;
 
     // Implementation part

-    
+

     void CalcPixel( WXColormap cmap );
     unsigned long GetPixel() const;
     WXColor *GetColor() const;
 
     void CalcPixel( WXColormap cmap );
     unsigned long GetPixel() const;
     WXColor *GetColor() const;
 

+    void InitFromName(const wxString& colourName);
+

 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

-    
-    // Helper functions
-    void InitFromName(const wxString& colourName);
+

 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)