1. the main function for item insertion is now DoInsertItems() which allows for much more efficient addition of many new items at once 2. the items client data management is done entirely in wxItemContainer itself, the derived classes don't have to distinguish between void and object client data 3. many fixes for sorted controls, in particular implemented wxCB_SORT support in wxGTK combobox git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
		
			
				
	
	
		
			136 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			136 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/os2/choice.h
 | 
						|
// Purpose:     wxChoice class
 | 
						|
// Author:      David Webster
 | 
						|
// Modified by:
 | 
						|
// Created:     10/13/99
 | 
						|
// RCS-ID:      $Id$
 | 
						|
// Copyright:   (c) David Webster
 | 
						|
// Licence:     wxWindows licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef _WX_CHOICE_H_
 | 
						|
#define _WX_CHOICE_H_
 | 
						|
 | 
						|
// ----------------------------------------------------------------------------
 | 
						|
// Choice item
 | 
						|
// ----------------------------------------------------------------------------
 | 
						|
 | 
						|
class WXDLLEXPORT wxChoice: public wxChoiceBase
 | 
						|
{
 | 
						|
  DECLARE_DYNAMIC_CLASS(wxChoice)
 | 
						|
 | 
						|
public:
 | 
						|
    // ctors
 | 
						|
    inline wxChoice() { }
 | 
						|
    virtual ~wxChoice();
 | 
						|
 | 
						|
    inline wxChoice( 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 = wxChoiceNameStr
 | 
						|
                   )
 | 
						|
    {
 | 
						|
        Create( pParent
 | 
						|
               ,vId
 | 
						|
               ,rPos
 | 
						|
               ,rSize
 | 
						|
               ,n
 | 
						|
               ,asChoices
 | 
						|
               ,lStyle
 | 
						|
               ,rValidator
 | 
						|
               ,rsName
 | 
						|
              );
 | 
						|
    }
 | 
						|
 | 
						|
    inline wxChoice( wxWindow*            pParent
 | 
						|
                    ,wxWindowID           vId
 | 
						|
                    ,const wxPoint&       rPos
 | 
						|
                    ,const wxSize&        rSize
 | 
						|
                    ,const wxArrayString& asChoices
 | 
						|
                    ,long                 lStyle = 0
 | 
						|
                    ,const wxValidator&   rValidator = wxDefaultValidator
 | 
						|
                    ,const wxString&      rsName = wxChoiceNameStr
 | 
						|
                   )
 | 
						|
    {
 | 
						|
        Create( pParent
 | 
						|
               ,vId
 | 
						|
               ,rPos
 | 
						|
               ,rSize
 | 
						|
               ,asChoices
 | 
						|
               ,lStyle
 | 
						|
               ,rValidator
 | 
						|
               ,rsName
 | 
						|
              );
 | 
						|
    }
 | 
						|
 | 
						|
    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 = wxChoiceNameStr
 | 
						|
               );
 | 
						|
 | 
						|
    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 = wxChoiceNameStr
 | 
						|
               );
 | 
						|
 | 
						|
    //
 | 
						|
    // Implement base class virtuals
 | 
						|
    //
 | 
						|
    virtual void     DoDeleteOneItem(unsigned int n);
 | 
						|
    virtual void     DoClear(void);
 | 
						|
 | 
						|
    virtual unsigned int GetCount() const;
 | 
						|
    virtual int      GetSelection(void) const;
 | 
						|
    virtual void     SetSelection(int n);
 | 
						|
 | 
						|
    virtual wxString GetString(unsigned int n) const;
 | 
						|
    virtual void     SetString(unsigned int n, const wxString& rsStr);
 | 
						|
 | 
						|
    //
 | 
						|
    // OS2 only
 | 
						|
    //
 | 
						|
    virtual bool     OS2Command( WXUINT uParam
 | 
						|
                                ,WXWORD wId
 | 
						|
                               );
 | 
						|
    MRESULT          OS2WindowProc( WXUINT   uMsg
 | 
						|
                                   ,WXWPARAM wParam
 | 
						|
                                   ,WXLPARAM lParam
 | 
						|
                                  );
 | 
						|
 | 
						|
protected:
 | 
						|
    virtual int           DoInsertItems(const wxArrayStringsAdapter& items,
 | 
						|
                                        unsigned int pos,
 | 
						|
                                        void **clientData,
 | 
						|
                                        wxClientDataType type);
 | 
						|
 | 
						|
    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
 | 
						|
    virtual void*         DoGetItemClientData(unsigned int n) const;
 | 
						|
    virtual wxSize        DoGetBestSize(void) const;
 | 
						|
    virtual void          DoSetSize( int nX
 | 
						|
                                    ,int nY
 | 
						|
                                    ,int nWidth
 | 
						|
                                    ,int nHeight
 | 
						|
                                    ,int nsizeFlags = wxSIZE_AUTO
 | 
						|
                                   );
 | 
						|
    void                  Free(void);
 | 
						|
}; // end of CLASS wxChoice
 | 
						|
 | 
						|
#endif // _WX_CHOICE_H_
 |