implemented GetBestSize() (TODO: make this available in generic version as well)

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 9002149bda6ab1c66d0c38467baec9d7d410ccce..e5735c3b2ec63e04a5019ecec2a108c28a5cfa66 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/x11/colour.h
 // Purpose:     wxColour class
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#ifdef __GNUG__
-#pragma interface "colour.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -26,24 +22,30 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDC;
-class wxPaintDC;
-class wxBitmap;
-class wxWindow;
+class WXDLLIMPEXP_CORE wxDC;
+class WXDLLIMPEXP_CORE wxPaintDC;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxWindow;
 
-class wxColour;
+class WXDLLIMPEXP_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour: public wxGDIObject
 {
 public:
+    // constructors
+    // ------------
+
+    // default
     wxColour() { }
-  
-    // Construct from RGB
+
+    // from separate RGB
     wxColour( unsigned char red, unsigned char green, unsigned char blue );
+
+    // from packed RGB
     wxColour( unsigned long colRGB ) { Set(colRGB); }
 
     // Implicit conversion from the colour name
@@ -53,13 +55,16 @@ public:
     wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
 #endif
 
+    // Get colour from name or wxNullColour
+    static wxColour CreateByName(const wxString& name);
+
     wxColour( const wxColour& col ) { Ref(col); }
     wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
 
     ~wxColour();
 
     bool Ok() const { return m_refData != NULL; }
-  
+
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
@@ -78,18 +83,18 @@ public:
     unsigned char Blue() const;
 
     // Implementation part
-    
+
     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;
-    
-    // Helper functions
-    void InitFromName(const wxString& colourName);
+
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
@@ -98,4 +103,3 @@ private:
 #endif
 
 // _WX_COLOUR_H_
-