X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37f214d588b02079a3ddf64c2e46585ca1657c1b..bd73ba41f93a040ecf9c18040d7f788992d0a6ec:/include/wx/os2/choice.h?ds=sidebyside

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 25adcde547..6289745486 100644
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -15,60 +15,68 @@
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControl
+class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
- public:
-  inline wxChoice() { }
+public:
+    // ctors
+    inline wxChoice() { }
 
-  inline wxChoice(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr)
-  {
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-  }
+    inline wxChoice(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             long style = 0,
+#if wxUSE_VALIDATORS
+             const wxValidator& validator = wxDefaultValidator,
+#endif
+             const wxString& name = wxChoiceNameStr)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
 
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr);
+    bool Create(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             long style = 0,
+#if wxUSE_VALIDATORS
+             const wxValidator& validator = wxDefaultValidator,
+#endif
+             const wxString& name = wxChoiceNameStr);
 
-  virtual int  DoAppend(const wxString& item);
-  virtual void Delete(int n);
-  virtual void Clear();
+    // Implement base class virtuals
+    virtual int  DoAppend(const wxString& item);
+    virtual void Delete(int n);
+    virtual void Clear();
 
-  virtual int GetCount() const;
-  virtual int GetSelection() const ;
-  virtual void SetSelection(int n);
+    virtual int GetCount() const;
+    virtual int GetSelection() const ;
+    virtual void SetSelection(int n);
 
-  virtual int FindString(const wxString& s) const;
-  virtual wxString GetString(int n) const ;
+    virtual int FindString(const wxString& s) const;
+    virtual wxString GetString(int n) const ;
+    virtual void SetString(int n, const wxString& s);
 
-  // OS2 only
-  virtual bool OS2Command(WXUINT param, WXWORD id);
-  MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // OS2 only
+    virtual bool OS2Command(WXUINT param, WXWORD id);
+    MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
-    virtual void DoSetClientData( int n, void* clientData );
-    virtual void* DoGetClientData( int n ) const;
-    virtual void DoSetClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetClientObject( int n ) const;
+    virtual void DoSetItemClientData( int n, void* clientData );
+    virtual void* DoGetItemClientData( int n ) const;
+    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // OS2 implementation
-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 private:
     // Virtual function hiding supression
+/*
     inline virtual void DoSetClientData( void *data )
     { wxWindowBase::DoSetClientData(data); }
     inline virtual void DoSetClientObject( wxClientData *data )
@@ -77,6 +85,7 @@ private:
     { return(wxWindowBase::DoGetClientObject());}
     inline virtual void *DoGetClientData() const
     { return(wxWindowBase::DoGetClientData());}
+*/
 };
 
 #endif // _WX_CHOICE_H_