Rebake from clean wx tree.

[wxWidgets.git] / include / wx / os2 / choice.h

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index b04aee3d72986584051e06269597eeedff2841ce..fc8ec9f9761d2bd560bdeccac8868a2b47ca5834 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -16,13 +16,13 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
 // Choice item
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoice: public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase

 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     // ctors
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     // ctors

-    inline wxChoice() { Init(); }
+    inline wxChoice() { }

     virtual ~wxChoice();
 
     inline wxChoice( wxWindow*          pParent
     virtual ~wxChoice();
 
     inline wxChoice( wxWindow*          pParent


@@ -36,7 +36,6 @@ public:
                     ,const wxString&    rsName = wxChoiceNameStr
                    )
     {
                     ,const wxString&    rsName = wxChoiceNameStr
                    )
     {

-        Init();

         Create( pParent
                ,vId
                ,rPos
         Create( pParent
                ,vId
                ,rPos


@@ -59,7 +58,6 @@ public:
                     ,const wxString&      rsName = wxChoiceNameStr
                    )
     {
                     ,const wxString&      rsName = wxChoiceNameStr
                    )
     {

-        Init();

         Create( pParent
                ,vId
                ,rPos
         Create( pParent
                ,vId
                ,rPos


@@ -95,12 +93,11 @@ public:
     //
     // Implement base class virtuals
     //
     //
     // 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 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;
     virtual void     SetSelection(int n);
 
     virtual wxString GetString(unsigned int n) const;


@@ -118,15 +115,13 @@ public:
                                   );
 
 protected:
                                   );
 
 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          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
     virtual wxSize        DoGetBestSize(void) const;
     virtual void          DoSetSize( int nX
                                     ,int nY


@@ -135,11 +130,6 @@ protected:
                                     ,int nsizeFlags = wxSIZE_AUTO
                                    );
     void                  Free(void);
                                     ,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_
 }; // end of CLASS wxChoice
 
 #endif // _WX_CHOICE_H_