X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20fd9757ff00f05f10b76b8534149e7889340a9e..97c79de27c368de18afab3ca655bc48a4d53fc30:/include/wx/msw/listbox.h?ds=inline diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index b80927bd3d..6d1d8c0ba6 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -26,11 +26,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; // define the array of list box items #include - #undef WXDLLEXPORTLOCAL - #define WXDLLEXPORTLOCAL WXDLLEXPORT - WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray); - #undef WXDLLEXPORTLOCAL - #define WXDLLEXPORTLOCAL + WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray); #endif @@ -84,8 +80,8 @@ public: #endif // wxUSE_OWNER_DRAWN virtual void Append(const wxString& item); - virtual void Append(const wxString& item, char *clientData); - virtual void Set(int n, const wxString* choices, char **clientData = NULL); + virtual void Append(const wxString& item, void *clientData); + virtual void Set(int n, const wxString* choices, void **clientData = NULL); virtual int FindString(const wxString& s) const ; virtual void Clear(); virtual void SetSelection(int n, bool select = TRUE); @@ -95,8 +91,8 @@ public: // For single choice list item only virtual int GetSelection() const ; virtual void Delete(int n); - virtual char *GetClientData(int n) const ; - virtual void SetClientData(int n, char *clientData); + virtual void *GetClientData(int n) const ; + virtual void SetClientData(int n, void *clientData); virtual void SetString(int n, const wxString& s); // For single or multiple choice list item @@ -133,14 +129,12 @@ protected: int m_noItems; int m_selected; + virtual wxSize DoGetBestSize(); + #if wxUSE_OWNER_DRAWN // control items wxListBoxItemsArray m_aItems; #endif - - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); }; #endif