Fix the warning about code sensitive to packing (VisualC).

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 0a3409aa7b7cacadc35785467be27620e16c7a6d..8912ad3cf7c216e78a3a5da231b784296ce6194b 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "colour.h"
 #endif
 
 #pragma interface "colour.h"
 #endif
 


@@ -28,20 +28,21 @@ public:
     // default
     wxColour();
     // from RGB
     // default
     wxColour();
     // from RGB

-    wxColour( unsigned char red, unsigned char green, unsigned char blue );
+    wxColour( unsigned char red, unsigned char green, unsigned char blue )
+        { Set(red, green, blue); }

     wxColour( unsigned long colRGB ) { Set(colRGB); }
     wxColour( unsigned long colRGB ) { Set(colRGB); }

-    
+

     // implicit conversion from the colour name
     wxColour( const wxString &colourName ) { InitFromName(colourName); }
     wxColour( const char *colourName ) { InitFromName(colourName); }
     // implicit conversion from the colour name
     wxColour( const wxString &colourName ) { InitFromName(colourName); }
     wxColour( const char *colourName ) { InitFromName(colourName); }

-    
+

     // copy ctors and assignment operators
     wxColour( const wxColour& col );
     wxColour& operator = ( const wxColour& col );
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
     wxColour& operator = ( const wxColour& col );

-    
+

     // dtor
     ~wxColour();
     // dtor
     ~wxColour();

-    
+

     // Set() functions
     void Set( unsigned char red, unsigned char green, unsigned char blue );
     void Set( unsigned long colRGB )
     // Set() functions
     void Set( unsigned char red, unsigned char green, unsigned char blue );
     void Set( unsigned long colRGB )


@@ -52,38 +53,45 @@ public:
             (unsigned char)(colRGB >> 8),
             (unsigned char)(colRGB >> 16));
     }
             (unsigned char)(colRGB >> 8),
             (unsigned char)(colRGB >> 16));
     }

-    
+

     // accessors
     bool Ok() const {return m_isInit; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }
     // accessors
     bool Ok() const {return m_isInit; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }

-    
+

     int GetPixel() const { return m_pixel; };
     int GetPixel() const { return m_pixel; };

-    void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
-    
+    void SetPixel(int pixel) { m_pixel = pixel; m_isInit = true; };
+

     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }

-    
+

     inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
     inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }

-    
+
+    // Get colour from name or wxNullColour
+    static wxColour CreateByName(const wxString& name);
+

     // Allocate a colour, or nearest colour, using the given display.
     // Allocate a colour, or nearest colour, using the given display.

-    // If realloc is TRUE, ignore the existing pixel, otherwise just return
+    // If realloc is true, ignore the existing pixel, otherwise just return

     // the existing one.
     // Returns the allocated pixel.
     // the existing one.
     // Returns the allocated pixel.

-    
+

     // TODO: can this handle mono displays? If not, we should have an extra
     // flag to specify whether this should be black or white by default.
     // TODO: can this handle mono displays? If not, we should have an extra
     // flag to specify whether this should be black or white by default.

-    
-    int AllocColour(WXDisplay* display, bool realloc = FALSE);
-    
+
+    int AllocColour(WXDisplay* display, bool realloc = false);
+

     void InitFromName(const wxString& col);
     void InitFromName(const wxString& col);

-    
+
+protected:
+    // Helper function
+    void Init();
+

 private:
     bool          m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
 private:
     bool          m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;

-    
+

 public:
     int           m_pixel;
 };
 public:
     int           m_pixel;
 };