X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2ac737fba8f9ea33aa7ed8d0534b72cb64db1d7..d73efa0b9c06aec0a4b39af3b7d1eab424068f83:/include/wx/combo.h diff --git a/include/wx/combo.h b/include/wx/combo.h index 76bf25f532..4bae2cfea6 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -4,7 +4,6 @@ // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 -// RCS-ID: $Id$ // Copyright: (c) Jaakko Salli // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -471,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 @@ -546,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);