X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41fb3475406380b4a5411f0e4d820061155204d4..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/bmpcbox.h?ds=inline diff --git a/include/wx/msw/bmpcbox.h b/include/wx/msw/bmpcbox.h index 0942202095..0462c46217 100644 --- a/include/wx/msw/bmpcbox.h +++ b/include/wx/msw/bmpcbox.h @@ -3,7 +3,6 @@ // Purpose: wxBitmapComboBox // Author: Jaakko Salli // Created: 2008-04-06 -// RCS-ID: $Id$ // Copyright: (c) 2008 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -85,6 +84,8 @@ public: // Sets the image for the given item. virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); + virtual bool SetFont(const wxFont& font); + // Adds item with image to the end of the combo box. int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap); int Append(const wxString& item, const wxBitmap& bitmap, void *clientData); @@ -107,8 +108,6 @@ protected: // Event handlers void OnSize(wxSizeEvent& event); - virtual bool SetFont(const wxFont& font); - virtual wxItemContainer* GetItemContainer() { return this; } virtual wxWindow* GetControl() { return this; } @@ -120,6 +119,7 @@ protected: virtual void DoDeleteOneItem(unsigned int n); virtual bool OnAddBitmap(const wxBitmap& bitmap); + virtual wxSize DoGetBestSize() const; void RecreateControl(); private: