Only declare wxDialog::SetWindowStyleFlag() when wxUSE_DIALOG_SIZEGRIP.

[wxWidgets.git] / include / wx / msw / bmpcbox.h

diff --git a/include/wx/msw/bmpcbox.h b/include/wx/msw/bmpcbox.h
index 094220209550d0d77b707f88116da741e521fab0..ffc843c1bce4f5259bf3c7e635d494092dffa6c2 100644 (file)
--- a/include/wx/msw/bmpcbox.h
+++ b/include/wx/msw/bmpcbox.h
@@ -85,6 +85,8 @@ 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);
+

     // 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);
     // 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 +109,6 @@ protected:
     // Event handlers
     void OnSize(wxSizeEvent& event);
 
     // Event handlers
     void OnSize(wxSizeEvent& event);
 

-    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; }
 


@@ -120,6 +120,7 @@ protected:
     virtual void DoDeleteOneItem(unsigned int n);
 
     virtual bool OnAddBitmap(const wxBitmap& bitmap);
     virtual void DoDeleteOneItem(unsigned int n);
 
     virtual bool OnAddBitmap(const wxBitmap& bitmap);

+    virtual wxSize DoGetBestSize() const;

     void RecreateControl();
 
 private:
     void RecreateControl();
 
 private: