X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48fa6bd38ac743f4067e74d4168168ae3a4a068e..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/msw/choice.h?ds=sidebyside diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 5348fd5e26..3d004d2ab6 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 // ---------------------------------------------------------------------------- @@ -24,7 +20,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase { public: // ctors - wxChoice() { } + wxChoice() { Init(); } virtual ~wxChoice(); wxChoice(wxWindow *parent, @@ -36,8 +32,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr) { + Init(); Create(parent, id, pos, size, n, choices, style, validator, name); } + wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -47,6 +45,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr) { + Init(); Create(parent, id, pos, size, choices, style, validator, name); } @@ -67,31 +66,36 @@ 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; + virtual int GetCurrentSelection() const; 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); + virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd); + virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; 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; @@ -100,10 +104,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(); @@ -120,6 +120,13 @@ protected: // free all memory we have (used by Clear() and dtor) void Free(); + + // last "completed" selection, i.e. not the transient one while the user is + // browsing the popup list: this is only used when != wxID_NONE which is + // the case while the drop down is opened + int m_lastAcceptedSelection; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice) };