Fixes for OpenVMS on IA64

[wxWidgets.git] / include / wx / odcombo.h

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 4879c2bbfc217fb627abf855a2f03cc7074c347a..26415e8d246cf7c02044869a7cfb1fe71728614a 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -233,15 +233,15 @@ private:
 // the wxComboCtrl.
 // ----------------------------------------------------------------------------
 
 // the wxComboCtrl.
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : public wxComboCtrl,
-                                             public wxItemContainer
+class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox :
+    public wxWindowWithItems<wxComboCtrl, wxItemContainer>

 {
     //friend class wxComboPopupWindow;
     friend class wxVListBoxComboPopup;
 public:
 
     // ctors and such
 {
     //friend class wxComboPopupWindow;
     friend class wxVListBoxComboPopup;
 public:
 
     // ctors and such

-    wxOwnerDrawnComboBox() : wxComboCtrl() { Init(); }
+    wxOwnerDrawnComboBox() { Init(); }

 
     wxOwnerDrawnComboBox(wxWindow *parent,
                          wxWindowID id,
 
     wxOwnerDrawnComboBox(wxWindow *parent,
                          wxWindowID id,


@@ -253,7 +253,6 @@ public:
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = wxComboBoxNameStr)
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = wxComboBoxNameStr)

-        : wxComboCtrl()

     {
         Init();
 
     {
         Init();
 


@@ -339,8 +338,6 @@ public:
 
     virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
 
 
     virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
 

-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-

 protected:
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);
 protected:
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);