Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index de243d30a7df5ca2c9a27995c76314b8d3a7a2b8..788466d8e96b94dd79b665853191fa8ee7269fe2 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -11,7 +11,7 @@
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -40,7 +40,7 @@ class 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); }


@@ -61,7 +61,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); }
 


@@ -80,18 +80,21 @@ public:
     unsigned char Blue() const;
 
 
     unsigned char Blue() const;
 
 

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

     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *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)