corrected WX_DEFINE_VARARG_FUNC_NOP usage

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 9293bdab9f2f22ddc14e8ce13cd320998b9cfaeb..8054f2234422fe39a64df49439cd20cbfec36452 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
+// Name:        wx/os2/choice.h
 // Purpose:     wxChoice class
 // Author:      David Webster
 // Modified by:
@@ -12,7 +12,10 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
+// ----------------------------------------------------------------------------
 // Choice item
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
@@ -20,6 +23,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 public:
     // ctors
     inline wxChoice() { }
+    virtual ~wxChoice();
 
     inline wxChoice( wxWindow*          pParent
                     ,wxWindowID         vId
@@ -89,20 +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     Delete(unsigned int n);
     virtual void     Clear(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 int      FindString(const wxString& rsStr) const;
-    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
@@ -116,14 +115,12 @@ 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           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