Missing 'int' interface for wxPlatform.

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

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index a53e4d587d6577c8972b4ddf5f257f779e3a1f2b..832778c23789606bf62daf91d3c72807bdd1ea48 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_OWNERDRAWNCOMBOBOX
+#if wxUSE_ODCOMBOBOX

 
 #include "wx/combo.h"
 #include "wx/ctrlsub.h"
 
 #include "wx/combo.h"
 #include "wx/ctrlsub.h"


@@ -52,7 +52,7 @@ enum
 //
 // Notes:
 //   wxOwnerDrawnComboBox uses this as its popup. However, it always derives
 //
 // Notes:
 //   wxOwnerDrawnComboBox uses this as its popup. However, it always derives

-//   from native wxComboControl. If you need to use this popup with
+//   from native wxComboCtrl. If you need to use this popup with

 //   wxGenericComboControl, then remember that vast majority of item manipulation
 //   functionality is implemented in the wxVListBoxComboPopup class itself.
 //
 //   wxGenericComboControl, then remember that vast majority of item manipulation
 //   functionality is implemented in the wxVListBoxComboPopup class itself.
 //


@@ -175,18 +175,18 @@ private:
 // ----------------------------------------------------------------------------
 // wxOwnerDrawnComboBox: a generic wxComboBox that allows custom paint items
 // in addition to many other types of customization already allowed by
 // ----------------------------------------------------------------------------
 // wxOwnerDrawnComboBox: a generic wxComboBox that allows custom paint items
 // in addition to many other types of customization already allowed by

-// the wxComboControl.
+// the wxComboCtrl.

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : public wxComboControl,
+class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : public wxComboCtrl,

                                              public wxItemContainer
 {
     friend class wxComboPopupWindow;
                                              public wxItemContainer
 {
     friend class wxComboPopupWindow;

-    friend class wxComboControlBase;
+    friend class wxComboCtrlBase;

 public:
 
     // ctors and such
 public:
 
     // ctors and such

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

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


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

-        : wxComboControl()
+        : wxComboCtrl()

     {
         Init();
 
     {
         Init();
 


@@ -208,7 +208,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxString& value = wxEmptyString,
+                const wxString& value,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -260,7 +260,7 @@ public:
     virtual int FindString(const wxString& s) const;
     virtual void Select(int n);
     virtual int GetSelection() const;
     virtual int FindString(const wxString& s) const;
     virtual void Select(int n);
     virtual int GetSelection() const;

-    void SetSelection(int n) { Select(n); }
+    virtual void SetSelection(int n) { Select(n); }

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 


@@ -293,6 +293,6 @@ private:
 };
 
 
 };
 
 

-#endif // wxUSE_OWNERDRAWNCOMBOBOX
+#endif // wxUSE_ODCOMBOBOX

 #endif
     // _WX_ODCOMBO_H_
 #endif
     // _WX_ODCOMBO_H_