Make wxComboCtrlBase::Set*groundColour() methods public.

SetForegroundColour() and SetBackgroundColour() were -- presumably
accidentally -- protected in wxComboCtrlBase, even though they are
documented public virtual methods of wxWindow. This prevented their
use from user code.

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

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 51258253699c36b142a4039a0bb92062677b9fc9..4bae2cfea63995537e378b64783d25d8e4541808 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -470,6 +470,10 @@ public:
     virtual wxWindow *GetMainWindowOfCompositeControl()
         { return m_mainCtrlWnd; }
 
     virtual wxWindow *GetMainWindowOfCompositeControl()
         { return m_mainCtrlWnd; }
 

+    // also set the embedded wxTextCtrl colours
+    virtual bool SetForegroundColour(const wxColour& colour);
+    virtual bool SetBackgroundColour(const wxColour& colour);
+

 protected:
 
     // Returns true if hint text should be drawn in the control
 protected:
 
     // Returns true if hint text should be drawn in the control


@@ -545,10 +549,6 @@ protected:
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 

-    // also set the embedded wxTextCtrl colours
-    virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetBackgroundColour(const wxColour& colour);
-

     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);
 
     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);