g++ compilation fix after latest changes

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 5700c35de47fe309fd60d45c426b95c366ae1e7f..fc8ec9f9761d2bd560bdeccac8868a2b47ca5834 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -12,14 +12,18 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
+// ----------------------------------------------------------------------------
 // Choice item
-class WXDLLEXPORT wxChoice: public wxChoiceBase
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     // ctors
     inline wxChoice() { }
+    virtual ~wxChoice();
 
     inline wxChoice( wxWindow*          pParent
                     ,wxWindowID         vId
@@ -89,19 +93,15 @@ public:
     //
     // Implement base class virtuals
     //
-    virtual int      DoAppend(const wxString& rsItem);
-    virtual int      DoInsert(const wxString& rsItem, int pos);
-    virtual void     Delete(int n);
-    virtual void     Clear(void);
+    virtual void     DoDeleteOneItem(unsigned int n);
+    virtual void     DoClear(void);
 
-    virtual int      GetCount(void) const;
-    virtual int      GetSelection(void) const ;
+    virtual unsigned int GetCount() const;
+    virtual int      GetSelection(void) const;
     virtual void     SetSelection(int n);
 
-    virtual wxString GetString(int n) const ;
-    virtual void     SetString( int n
-                               ,const wxString& rsStr
-                              );
+    virtual wxString GetString(unsigned int n) const;
+    virtual void     SetString(unsigned int n, const wxString& rsStr);
 
     //
     // OS2 only
@@ -115,14 +115,13 @@ public:
                                   );
 
 protected:
-    virtual void          DoSetItemClientData( int   n
-                                              ,void* pClientData
-                                             );
-    virtual void*         DoGetItemClientData(int n) const;
-    virtual void          DoSetItemClientObject( int           n
-                                                ,wxClientData* pClientData
-                                               );
-    virtual wxClientData* DoGetItemClientObject(int n) const;
+    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