X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ba93d23bfc6a5764ff7fcc751d9b6164c23e10e..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/choice.h?ds=sidebyside diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 4661025fe9..cff06ed33e 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/msw/choice.h // Purpose: wxChoice class // Author: Julian Smart // Modified by: Vadim Zeitlin to derive from wxChoiceBase @@ -12,10 +12,6 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "choice.h" -#endif - // ---------------------------------------------------------------------------- // Choice item // ---------------------------------------------------------------------------- @@ -70,37 +66,39 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - // implement base class pure virtuals - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); - virtual void Delete(int n); - virtual void Clear(); + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(); - virtual int GetCount() const; + virtual unsigned int GetCount() const; virtual int GetSelection() const; -#if wxABI_VERSION >= 20602 virtual int GetCurrentSelection() const; -#endif virtual void SetSelection(int n); - virtual int FindString(const wxString& s) const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); + virtual int FindString(const wxString& s, bool bCase = false) const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& s); // MSW only virtual bool MSWCommand(WXUINT param, WXWORD id); WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd); + virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } protected: // common part of all ctors void Init() { m_lastAcceptedSelection = wxID_NONE; } + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoSetItemClientData( int n, void* clientData ); - virtual void* DoGetItemClientData( int n ) const; - virtual void DoSetItemClientObject( int n, wxClientData* clientData ); - virtual wxClientData* DoGetItemClientObject( int n ) const; + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; // MSW implementation virtual wxSize DoGetBestSize() const; @@ -109,10 +107,6 @@ protected: int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - // update the height of the drop down list to fit the number of items we // have (without changing the visible height) void UpdateVisibleHeight();