Added wxArtProvider::GetMessageBoxIconId().

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

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index f5fd36a87122ebe18bde4cd6476cbfbf964a3a05..1c803aa5a2303396328bbd87fa53b561c88ffd1a 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -307,8 +307,6 @@ public:
     }
 
     // wxControlWithItems methods
     }
 
     // wxControlWithItems methods

-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);

     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);


@@ -335,6 +333,8 @@ public:
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 protected:
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 protected:

+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

 
     // Callback for drawing. Font, background and text colour have been
     // prepared according to selection, focus and such.
 
     // Callback for drawing. Font, background and text colour have been
     // prepared according to selection, focus and such.