Warning fixes after char->wxChar in wxVariant.

[wxWidgets.git] / include / wx / univ / combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index f76985d6a61d0b02e574856f71b27a702d8b8a45..383582c06fb6eedb7a64261bbf311d341061789a 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxListBox;
 // wxComboBox: a combination of text control and a listbox
 // ----------------------------------------------------------------------------
 
 // wxComboBox: a combination of text control and a listbox
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxComboBox : public wxComboControl, public wxComboBoxBase
+class WXDLLEXPORT wxComboBox : public wxComboCtrl, public wxComboBoxBase

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


@@ -129,13 +129,19 @@ public:
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
     // we have our own input handler and our own actions
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
     // we have our own input handler and our own actions

-    // (but wxComboControl already handled Popup/Dismiss)
+    // (but wxComboCtrl already handled Popup/Dismiss)

     /*
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
     */
 
     /*
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
     */
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+

 protected:
     virtual int DoAppend(const wxString& item);
     virtual int DoInsert(const wxString& item, unsigned int pos);
 protected:
     virtual int DoAppend(const wxString& item);
     virtual int DoInsert(const wxString& item, unsigned int pos);


@@ -158,20 +164,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 };
 

-
-// ----------------------------------------------------------------------------
-// wxStdComboBoxInputHandler: allows the user to open/close the combo from kbd
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdComboBoxInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdComboBoxInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-};
-
-

 #endif // _WX_UNIV_COMBOBOX_H_
 #endif // _WX_UNIV_COMBOBOX_H_