X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a340b80d8a692f5308d26c1c1b95fd689a1d7eb3..538f3830191e25eaf0edb0a379e08d4f85ee49bc:/include/wx/generic/combo.h

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 49c3c271d0..e6df1706e0 100644
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/combo.h
-// Purpose:     Generic wxComboControl
+// Purpose:     Generic wxComboCtrl
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
@@ -12,13 +12,13 @@
 #ifndef _WX_GENERIC_COMBOCONTROL_H_
 #define _WX_GENERIC_COMBOCONTROL_H_
 
-#if wxUSE_COMBOCONTROL
+#if wxUSE_COMBOCTRL
 
 // Only define generic if native doesn't have all the features
 #if !defined(wxCOMBOCONTROL_FULLY_FEATURED)
 
 // ----------------------------------------------------------------------------
-// Generic wxComboControl
+// Generic wxComboCtrl
 // ----------------------------------------------------------------------------
 
 #if defined(__WXUNIVERSAL__)
@@ -31,12 +31,13 @@
 
 #endif
 
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
 
-class WXDLLEXPORT wxGenericComboControl : public wxComboControlBase
+class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase
 {
 public:
     // ctors and such
-    wxGenericComboControl() : wxComboControlBase() { Init(); }
+    wxGenericComboControl() : wxComboCtrlBase() { Init(); }
 
     wxGenericComboControl(wxWindow *parent,
                           wxWindowID id = wxID_ANY,
@@ -46,7 +47,7 @@ public:
                           long style = 0,
                           const wxValidator& validator = wxDefaultValidator,
                           const wxString& name = wxComboBoxNameStr)
-        : wxComboControlBase()
+        : wxComboCtrlBase()
     {
         Init();
 
@@ -64,7 +65,9 @@ public:
 
     virtual ~wxGenericComboControl();
 
-    static int GetFeatures() { return wxComboControlFeatures::All; }
+    virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
+
+    static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if defined(__WXUNIVERSAL__)
     // we have our own input handler and our own actions
@@ -93,15 +96,15 @@ private:
 
 #ifndef _WX_COMBOCONTROL_H_
 
-// If native wxComboControl was not defined, then prepare a simple
+// If native wxComboCtrl was not defined, then prepare a simple
 // front-end so that wxRTTI works as expected.
 
-class WXDLLEXPORT wxComboControl : public wxGenericComboControl
+class WXDLLEXPORT wxComboCtrl : public wxGenericComboControl
 {
 public:
-    wxComboControl() : wxGenericComboControl() {}
+    wxComboCtrl() : wxGenericComboControl() {}
 
-    wxComboControl(wxWindow *parent,
+    wxComboCtrl(wxWindow *parent,
                    wxWindowID id = wxID_ANY,
                    const wxString& value = wxEmptyString,
                    const wxPoint& pos = wxDefaultPosition,
@@ -114,22 +117,22 @@ public:
         (void)Create(parent, id, value, pos, size, style, validator, name);
     }
 
-    virtual ~wxComboControl() {}
+    virtual ~wxComboCtrl() {}
 
 protected:
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxComboControl)
+    DECLARE_DYNAMIC_CLASS(wxComboCtrl)
 };
 
 #endif // _WX_COMBOCONTROL_H_
 
 #else
 
-#define wxGenericComboControl   wxComboControl
+#define wxGenericComboControl   wxComboCtrl
 
 #endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED)
 
-#endif // wxUSE_COMBOCONTROL
+#endif // wxUSE_COMBOCTRL
 #endif
     // _WX_GENERIC_COMBOCONTROL_H_