No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

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

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index 3a8a9e2d710321a2577caadfb4900f4d11e907ae..d0f1ad8eda76fd1a34838488f87446194df4a8fa 100644 (file)
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -40,7 +40,7 @@ public:
 // ========================================================================
 // wxComboBox
 // ========================================================================
 // ========================================================================
 // wxComboBox
 // ========================================================================

-class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField
+class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField

 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()


@@ -149,6 +149,10 @@ public:
     virtual void GetSelection(long *from, long *to) const;
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
     virtual void GetSelection(long *from, long *to) const;
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);

+
+private:
+    // implement wxTextEntry pure virtual method
+    virtual wxWindow *GetEditableWindow() { return this; }

 };
 
 #endif // __WX_COCOA_COMBOBOX_H__
 };
 
 #endif // __WX_COCOA_COMBOBOX_H__