no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / generic / combo.h

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 49c3c271d01dc43875f7d349426db796d37bfa9d..913511fcbfb8caeeefaad44bc33a964cc698538e 100644 (file)
--- 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
@@ -9,16 +9,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_GENERIC_COMBOCONTROL_H_
-#define _WX_GENERIC_COMBOCONTROL_H_
+#ifndef _WX_GENERIC_COMBOCTRL_H_
+#define _WX_GENERIC_COMBOCTRL_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,22 +31,23 @@
 
 #endif
 
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
-class WXDLLEXPORT wxGenericComboControl : public wxComboControlBase
+class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
 {
 public:
     // ctors and such
-    wxGenericComboControl() : wxComboControlBase() { Init(); }
-
-    wxGenericComboControl(wxWindow *parent,
-                          wxWindowID id = wxID_ANY,
-                          const wxString& value = wxEmptyString,
-                          const wxPoint& pos = wxDefaultPosition,
-                          const wxSize& size = wxDefaultSize,
-                          long style = 0,
-                          const wxValidator& validator = wxDefaultValidator,
-                          const wxString& name = wxComboBoxNameStr)
-        : wxComboControlBase()
+    wxGenericComboCtrl() : wxComboCtrlBase() { Init(); }
+
+    wxGenericComboCtrl(wxWindow *parent,
+                       wxWindowID id = wxID_ANY,
+                       const wxString& value = wxEmptyString,
+                       const wxPoint& pos = wxDefaultPosition,
+                       const wxSize& size = wxDefaultSize,
+                       long style = 0,
+                       const wxValidator& validator = wxDefaultValidator,
+                       const wxString& name = wxComboBoxNameStr)
+        : wxComboCtrlBase()
     {
         Init();
 
@@ -62,9 +63,13 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 
-    virtual ~wxGenericComboControl();
+    virtual ~wxGenericComboCtrl();
 
-    static int GetFeatures() { return wxComboControlFeatures::All; }
+    void SetCustomPaintWidth( int width );
+
+    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
@@ -87,49 +92,49 @@ private:
 
     DECLARE_EVENT_TABLE()
 
-    DECLARE_DYNAMIC_CLASS(wxGenericComboControl)
+    DECLARE_DYNAMIC_CLASS(wxGenericComboCtrl)
 };
 
 
 #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 WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl
 {
 public:
-    wxComboControl() : wxGenericComboControl() {}
-
-    wxComboControl(wxWindow *parent,
-                   wxWindowID id = wxID_ANY,
-                   const wxString& value = wxEmptyString,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxComboBoxNameStr)
-        : wxGenericComboControl()
+    wxComboCtrl() : wxGenericComboCtrl() {}
+
+    wxComboCtrl(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr)
+        : wxGenericComboCtrl()
     {
         (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 wxGenericComboCtrl   wxComboCtrl
 
 #endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED)
 
-#endif // wxUSE_COMBOCONTROL
+#endif // wxUSE_COMBOCTRL
 #endif
-    // _WX_GENERIC_COMBOCONTROL_H_
+    // _WX_GENERIC_COMBOCTRL_H_