Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Václav Slavík
2013-07-27 19:39:37 +00:00
parent a4ea083bbd
commit 5d9b5db01e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/combo.h
View File

@@ -470,6 +470,10 @@ public:
virtual wxWindow *GetMainWindowOfCompositeControl() virtual wxWindow *GetMainWindowOfCompositeControl()
{ return m_mainCtrlWnd; } { return m_mainCtrlWnd; }
// also set the embedded wxTextCtrl colours
virtual bool SetForegroundColour(const wxColour& colour);
virtual bool SetBackgroundColour(const wxColour& colour);
protected: protected:
// Returns true if hint text should be drawn in the control // Returns true if hint text should be drawn in the control
@@ -545,10 +549,6 @@ protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) 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 // NULL popup can be used to indicate default in a derived class
virtual void DoSetPopupControl(wxComboPopup* popup); virtual void DoSetPopupControl(wxComboPopup* popup);