X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0004982c831f56c65c390fb617711ff52595c2f3..97d13342cc2ac77e21c38115cc6ebecac930f92a:/interface/wx/odcombo.h diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h index 778ea4e202..92c516b9e2 100644 --- a/interface/wx/odcombo.h +++ b/interface/wx/odcombo.h @@ -45,7 +45,7 @@ enum wxOwnerDrawnComboBoxPaintingFlags @see wxComboCtrl window styles and @ref overview_windowstyles. - @beginEventTable{wxCommandEvent} + @beginEventEmissionTable{wxCommandEvent} @event{EVT_COMBOBOX(id, func)} Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on the list is selected. Note that calling GetValue() returns the new @@ -97,7 +97,7 @@ public: @see Create(), wxValidator */ wxOwnerDrawnComboBox(wxWindow* parent, wxWindowID id, - const wxString& value = "", + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, @@ -152,22 +152,33 @@ public: @remarks Derived classes should call or replace this function. */ - bool Create(wxWindow* parent, wxWindowID id, - const wxString& value = "", + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int n, const wxString choices[], long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "comboBox"); - bool Create(wxWindow* parent, wxWindowID id, + const wxString& name = wxComboBoxNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + int n, + const wxString choices[], + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr); + bool Create(wxWindow *parent, + wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "comboBox"); + const wxString& name = wxComboBoxNameStr); //@} /** @@ -180,6 +191,8 @@ public: */ virtual int GetWidestItemWidth(); +protected: + /** This method is used to draw the items background and, maybe, a border around it. @@ -189,8 +202,8 @@ public: @remarks flags has the same meaning as with OnDrawItem(). */ - void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, - int flags) const; + virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, + int flags) const; /** The derived class may implement this function to actually draw the item @@ -209,8 +222,8 @@ public: @param flags A combination of the ::wxOwnerDrawnComboBoxPaintingFlags enumeration values. */ - void OnDrawItem(wxDC& dc, const wxRect& rect, int item, - int flags) const; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, + int flags) const; /** The derived class may implement this method to return the height of the