1. wxTextCtrl::SetBackgroundColour() now works

2. wxListBox::SetBackgroundColour() now does something, although still not
   what I'd like
3. wxColour() now has a ctor from "const char *" to allow calls like
   SetBackgroundColour("green");
4. controls sample modified to use colors


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/colour.h

@@ -39,25 +39,24 @@ class wxColour;
 
 class wxColour: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxColour)
-
   public:
 
-    wxColour(void);
+    wxColour();
     wxColour( char red, char green, char blue );
-    wxColour( const wxString &colourName );
+    wxColour( const wxString &colourName ) { InitFromName(colourName); }
+    wxColour( const char *colourName ) { InitFromName(colourName); }
     wxColour( const wxColour& col );
     wxColour( const wxColour* col );
-    ~wxColour(void);
+    ~wxColour();
     wxColour& operator = ( const wxColour& col );
     wxColour& operator = ( const wxString& colourName );
     bool operator == ( const wxColour& col );
     bool operator != ( const wxColour& col );
     void Set( const unsigned char red, const unsigned char green, const unsigned char blue );
-    unsigned char Red(void) const;
-    unsigned char Green(void) const;
-    unsigned char Blue(void) const;
-    bool Ok(void) const;
+    unsigned char Red() const;
+    unsigned char Green() const;
+    unsigned char Blue() const;
+    bool Ok() const;
 
   private:
   public:
@@ -68,10 +67,15 @@ class wxColour: public wxGDIObject
     friend wxWindow;
         
     void CalcPixel( GdkColormap *cmap );
-    int GetPixel(void);
-    GdkColor *GetColor(void);
+    int GetPixel() const;
+    GdkColor *GetColor() const;
     
-    // no data :-)
+protected:
+    // helper functions
+    void InitFromName(const wxString& colourName);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxColour)
 };
   
 #endif // __GTKCOLOURH__

include/wx/gtk/listbox.h

@@ -85,6 +85,7 @@ class wxListBox: public wxControl
     
     void SetFont( const wxFont &font );
     void SetDropTarget( wxDropTarget *dropTarget );
+    virtual void SetBackgroundColour(const wxColour &colour);
 
   // implementation
     

include/wx/gtk/textctrl.h

@@ -102,7 +102,8 @@ class wxTextCtrl: public wxControl, public streambuf
     wxTextCtrl& operator<<(const char c);
 
     void SetFont( const wxFont &font );
-    
+    virtual void SetBackgroundColour(const wxColour &colour);
+
   // implementation    
     
     GtkWidget* GetConnectWidget(void);

include/wx/gtk/window.h

@@ -315,6 +315,12 @@ public:
   virtual void GetClientSizeConstraint(int *w, int *h) const ;
   virtual void GetPositionConstraint(int *x, int *y) const ;
 
+protected:
+  // set background colour for arbitrary window (useful because some windows
+  // don't work with m_wxwindow, e.g. wxTextCtrl)
+  void SetBackgroundColourHelper( const wxColour &colour, GdkWindow *window );
+
+private:
   DECLARE_EVENT_TABLE()
 };
 

include/wx/gtk1/colour.h

@@ -39,25 +39,24 @@ class wxColour;
 
 class wxColour: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxColour)
-
   public:
 
-    wxColour(void);
+    wxColour();
     wxColour( char red, char green, char blue );
-    wxColour( const wxString &colourName );
+    wxColour( const wxString &colourName ) { InitFromName(colourName); }
+    wxColour( const char *colourName ) { InitFromName(colourName); }
     wxColour( const wxColour& col );
     wxColour( const wxColour* col );
-    ~wxColour(void);
+    ~wxColour();
     wxColour& operator = ( const wxColour& col );
     wxColour& operator = ( const wxString& colourName );
     bool operator == ( const wxColour& col );
     bool operator != ( const wxColour& col );
     void Set( const unsigned char red, const unsigned char green, const unsigned char blue );
-    unsigned char Red(void) const;
-    unsigned char Green(void) const;
-    unsigned char Blue(void) const;
-    bool Ok(void) const;
+    unsigned char Red() const;
+    unsigned char Green() const;
+    unsigned char Blue() const;
+    bool Ok() const;
 
   private:
   public:
@@ -68,10 +67,15 @@ class wxColour: public wxGDIObject
     friend wxWindow;
         
     void CalcPixel( GdkColormap *cmap );
-    int GetPixel(void);
-    GdkColor *GetColor(void);
+    int GetPixel() const;
+    GdkColor *GetColor() const;
     
-    // no data :-)
+protected:
+    // helper functions
+    void InitFromName(const wxString& colourName);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxColour)
 };
   
 #endif // __GTKCOLOURH__

include/wx/gtk1/listbox.h

@@ -85,6 +85,7 @@ class wxListBox: public wxControl
     
     void SetFont( const wxFont &font );
     void SetDropTarget( wxDropTarget *dropTarget );
+    virtual void SetBackgroundColour(const wxColour &colour);
 
   // implementation
     

include/wx/gtk1/textctrl.h

@@ -102,7 +102,8 @@ class wxTextCtrl: public wxControl, public streambuf
     wxTextCtrl& operator<<(const char c);
 
     void SetFont( const wxFont &font );
-    
+    virtual void SetBackgroundColour(const wxColour &colour);
+
   // implementation    
     
     GtkWidget* GetConnectWidget(void);

include/wx/gtk1/window.h

@@ -315,6 +315,12 @@ public:
   virtual void GetClientSizeConstraint(int *w, int *h) const ;
   virtual void GetPositionConstraint(int *x, int *y) const ;
 
+protected:
+  // set background colour for arbitrary window (useful because some windows
+  // don't work with m_wxwindow, e.g. wxTextCtrl)
+  void SetBackgroundColourHelper( const wxColour &colour, GdkWindow *window );
+
+private:
   DECLARE_EVENT_TABLE()
 };
 

include/wx/msw/colour.h

@@ -19,17 +19,18 @@
 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxColour)
 public:
-  wxColour(void);
+  wxColour();
   wxColour(const unsigned char r, const unsigned char g, const unsigned char b);
   wxColour(unsigned long colRGB) { Set(colRGB); }
   wxColour(const wxColour& col);
-  wxColour(const wxString& col);
-  ~wxColour(void) ;
+  wxColour(const wxString& col) { InitFromName(col); }
+  wxColour(const char *col) { InitFromName(col); }
+  ~wxColour();
+
   wxColour& operator =(const wxColour& src) ;
   wxColour& operator =(const wxString& src) ;
-  inline int Ok(void) const { return (m_isInit) ; }
+  inline int Ok() const { return (m_isInit) ; }
 
   void Set(unsigned char r, unsigned char g, unsigned char b);
   void Set(unsigned long colRGB) 
@@ -46,23 +47,30 @@ public:
   void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
 #endif
 
-  inline unsigned char Red(void) const { return m_red; }
-  inline unsigned char Green(void) const { return m_green; }
-  inline unsigned char Blue(void) const { return m_blue; }
+  inline unsigned char Red() const { return m_red; }
+  inline unsigned char Green() const { return m_green; }
+  inline unsigned char Blue() const { return m_blue; }
 
   inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
 
   inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 
-  WXCOLORREF GetPixel(void) const { return m_pixel; };
+  WXCOLORREF GetPixel() const { return m_pixel; };
 
- private:
+private:
   bool 			m_isInit;
   unsigned char m_red;
   unsigned char m_blue;
   unsigned char m_green;
- public:
+
+  // helper func
+  void InitFromName(const wxString& colourName);
+
+public:
   WXCOLORREF m_pixel ;
+
+private:
+  DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
 #define wxColor wxColour