Ticket #9641: wxBitmapComboBox_SetFont.patch, making it public

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

diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index d0e616d40a853ce73816206ecfe1214696c7ef2e..3ea404a5e4b2a14c5cf1d0b2134095383f2255fe 100644 (file)
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -100,6 +100,7 @@ public:
 
     // Sets the image for the given item.
     virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);
 
     // Sets the image for the given item.
     virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);

+    virtual bool SetFont(const wxFont& font);

 
 protected:
 
 
 protected:
 


@@ -112,7 +113,6 @@ protected:
     void OnSize(wxSizeEvent& event);
 
     virtual wxSize DoGetBestSize() const;
     void OnSize(wxSizeEvent& event);
 
     virtual wxSize DoGetBestSize() const;

-    virtual bool SetFont(const wxFont& font);

 
     virtual wxItemContainer* GetItemContainer() { return this; }
     virtual wxWindow* GetControl() { return this; }
 
     virtual wxItemContainer* GetItemContainer() { return this; }
     virtual wxWindow* GetControl() { return this; }