From 5d9b5db01e6b36835af126413461c897026e438a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 27 Jul 2013 19:39:37 +0000 Subject: [PATCH] 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 --- include/wx/combo.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/combo.h b/include/wx/combo.h index 5125825369..4bae2cfea6 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -470,6 +470,10 @@ public: 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 @@ -545,10 +549,6 @@ protected: 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); -- 2.47.2