adopting correct implementation virtualization for Do/GradientFillConcentric

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 6f7feec581205d3afc06c528425e76117049783c..1dbff3e6a6dca3c2e27dab35bde5b921edab55af 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -12,7 +12,10 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

+// ----------------------------------------------------------------------------

 // Choice item
 // Choice item

+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)


@@ -20,6 +23,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 public:
     // ctors
     inline wxChoice() { }
 public:
     // ctors
     inline wxChoice() { }

+    virtual ~wxChoice();

 
     inline wxChoice( wxWindow*          pParent
                     ,wxWindowID         vId
 
     inline wxChoice( wxWindow*          pParent
                     ,wxWindowID         vId


@@ -89,13 +93,12 @@ public:
     //
     // Implement base class virtuals
     //
     //
     // Implement base class virtuals
     //

-    virtual int      DoAppend(const wxString& rsItem);
-    virtual int      DoInsert(const wxString& rsItem, unsigned int pos);

     virtual void     Delete(unsigned int n);
     virtual void     Clear(void);
 
     virtual unsigned int GetCount() const;
     virtual int      GetSelection(void) const;
     virtual void     Delete(unsigned int n);
     virtual void     Clear(void);
 
     virtual unsigned int GetCount() const;
     virtual int      GetSelection(void) const;

+    virtual int      GetCurrentSelection(void) const { return GetSelection(); }

     virtual void     SetSelection(int n);
 
     virtual wxString GetString(unsigned int n) const;
     virtual void     SetSelection(int n);
 
     virtual wxString GetString(unsigned int n) const;


@@ -113,7 +116,9 @@ public:
                                   );
 
 protected:
                                   );
 
 protected:

-    virtual void DoSetItemClientData(unsigned int n, void* pClientData);
+    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 void*         DoGetItemClientData(unsigned int n) const;
     virtual void          DoSetItemClientObject(unsigned int n, wxClientData* pClientData);
     virtual wxClientData* DoGetItemClientObject(unsigned int n) const;