X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c4d503ecd57835502fb1bbd13a71cb99019d0..57b49e9445306848a3318713c906a0976a1e36bf:/include/wx/os2/listbox.h?ds=sidebyside diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index 790d8606ac..aad4af0780 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.h +// Name: wx/os2/listbox.h // Purpose: wxListBox class // Author: David Webster // Modified by: @@ -17,12 +17,12 @@ // ---------------------------------------------------------------------------- #if wxUSE_OWNER_DRAWN - class WXDLLEXPORT wxOwnerDrawn; + class WXDLLEXPORT wxOwnerDrawn; - // define the array of list box items - #include + // define the array of list box items + #include "wx/dynarray.h" - WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray); + WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray); #endif // wxUSE_OWNER_DRAWN // forward decl for GetSelections() @@ -37,110 +37,131 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase public: // ctors and such wxListBox(); - wxListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxListBoxNameStr) + wxListBox( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,int n = 0 + ,const wxString asChoices[] = NULL + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxListBoxNameStr) + { + Create( pParent + ,vId + ,rPos + ,rSize + ,n + ,asChoices + ,lStyle + ,rValidator + ,rsName + ); + } + wxListBox( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxListBoxNameStr) { - Create(parent, id, pos, size, n, choices, style, validator, name); + Create( pParent + ,vId + ,rPos + ,rSize + ,asChoices + ,lStyle + ,rValidator + ,rsName + ); } - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxListBoxNameStr); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,int n = 0 + ,const wxString asChoices[] = NULL + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxListBoxNameStr + ); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxListBoxNameStr + ); virtual ~wxListBox(); - // implement base class pure virtuals - virtual void Clear(); - virtual void Delete(int n); + // + // Implement base class pure virtuals + // + virtual void Clear(void); + virtual void Delete(unsigned int n); - virtual int GetCount() const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); - virtual int FindString(const wxString& s) const; + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& rsString); - virtual bool IsSelected(int n) const; - virtual void SetSelection(int n, bool select = TRUE); - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; + virtual bool IsSelected(int n) const; + virtual void DoSetSelection(int n, bool bSelect); + virtual int GetSelection(void) const; + virtual int GetSelections(wxArrayInt& raSelections) const; - virtual int DoAppend(const wxString& item); - virtual void DoInsertItems(const wxArrayString& items, int pos); - virtual void DoSetItems(const wxArrayString& items, void **clientData); + virtual int DoAppend(const wxString& rsItem); + virtual void DoInsertItems( const wxArrayString& raItems, unsigned int rPos ); + virtual void DoSetItems( const wxArrayString& raItems + ,void ** ppClientData + ); - virtual void DoSetFirstItem(int n); + virtual void DoSetFirstItem(int n); - 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* pClientData); + virtual void* DoGetItemClientData(unsigned int n) const; + virtual void DoSetItemClientObject(unsigned int n, wxClientData* pClientData); + virtual wxClientData* DoGetItemClientObject(unsigned int n) const; + // // wxCheckListBox support + // #if wxUSE_OWNER_DRAWN - bool OS2OnMeasure(WXMEASUREITEMSTRUCT *item); - bool OS2OnDraw(WXDRAWITEMSTRUCT *item); - - // plug-in for derived classes - virtual wxOwnerDrawn *CreateItem(size_t n); - - // allows to get the item and use SetXXX functions to set it's appearance - wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; } + long OS2OnMeasure(WXMEASUREITEMSTRUCT *item); + bool OS2OnDraw(WXDRAWITEMSTRUCT *item); - // get the index of the given item - int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } + virtual wxOwnerDrawn* CreateItem(size_t n); + wxOwnerDrawn* GetItem(size_t n) const { return m_aItems[n]; } + int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } #endif // wxUSE_OWNER_DRAWN - // Windows-specific code to set the horizontal extent of the listbox, if - // necessary. If s is non-NULL, it's used to calculate the horizontal - // extent. Otherwise, all strings are used. - virtual void SetHorizontalExtent(const wxString& s = wxEmptyString); - - // Windows callbacks - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, - WXWPARAM wParam, WXLPARAM lParam); - - bool OS2Command(WXUINT param, WXWORD id); - - virtual void SetupColours(); + bool OS2Command( WXUINT uParam + ,WXWORD wId + ); + virtual void SetupColours(void); protected: - // do we have multiple selections? - bool HasMultipleSelection() const; - int m_noItems; - int m_selected; + bool HasMultipleSelection(void) const; + virtual wxSize DoGetBestSize(void) const; - virtual wxSize DoGetBestSize() const; + unsigned int m_nNumItems; + int m_nSelected; #if wxUSE_OWNER_DRAWN - // control items - wxListBoxItemsArray m_aItems; + // + // Control items + // + wxListBoxItemsArray m_aItems; #endif private: -#if wxUSE_WX_RESOURCES -# if wxUSE_OWNER_DRAWN - virtual wxControl *CreateItem(const wxItemResource* childResource, - const wxItemResource* parentResource, - const wxResourceTable *table = (const wxResourceTable *) NULL) - { return(wxWindowBase::CreateItem(childResource, parentResource, table)); } -# endif -#endif DECLARE_DYNAMIC_CLASS(wxListBox) -}; +}; // end of wxListBox -#endif - // _WX_LISTBOX_H_ +#endif // _WX_LISTBOX_H_