X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0934d91c7bb42c817785f9285b853d86931044b8..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/choice.h?ds=sidebyside

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index b04aee3d72..2a5e3ae4cc 100644
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,13 +15,13 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoice: public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     // ctors
-    inline wxChoice() { Init(); }
+    inline wxChoice() { }
     virtual ~wxChoice();
 
     inline wxChoice( wxWindow*          pParent
@@ -36,7 +35,6 @@ public:
                     ,const wxString&    rsName = wxChoiceNameStr
                    )
     {
-        Init();
         Create( pParent
                ,vId
                ,rPos
@@ -59,7 +57,6 @@ public:
                     ,const wxString&      rsName = wxChoiceNameStr
                    )
     {
-        Init();
         Create( pParent
                ,vId
                ,rPos
@@ -95,12 +92,11 @@ public:
     //
     // Implement base class virtuals
     //
-    virtual void     Delete(unsigned int n);
-    virtual void     Clear(void);
+    virtual void     DoDeleteOneItem(unsigned int n);
+    virtual void     DoClear(void);
 
     virtual unsigned int GetCount() const;
     virtual int      GetSelection(void) const;
-    virtual int      GetCurrentSelection(void) const;
     virtual void     SetSelection(int n);
 
     virtual wxString GetString(unsigned int n) const;
@@ -118,15 +114,13 @@ public:
                                   );
 
 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 int           DoAppend(const wxString& rsItem);
-    virtual int           DoInsert(const wxString& rsItem, unsigned int pos);
     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;
     virtual wxSize        DoGetBestSize(void) const;
     virtual void          DoSetSize( int nX
                                     ,int nY
@@ -135,11 +129,6 @@ protected:
                                     ,int nsizeFlags = wxSIZE_AUTO
                                    );
     void                  Free(void);
-
-    // 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;
 }; // end of CLASS wxChoice
 
 #endif // _WX_CHOICE_H_