wxHtmlWindow background drawing fixes for OS X and optimizations

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 144f662a101f470b1c4f0780e69ba79eaa724c67..b5e7d293cb1460b46040c05e698e7172396c56c6 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -18,7 +18,7 @@
 #if wxUSE_COMBOBOX
 
 // Combobox item
 #if wxUSE_COMBOBOX
 
 // Combobox item

-class WXDLLEXPORT wxComboBox : public wxChoice,
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,

                                public wxTextEntry
 {
 
                                public wxTextEntry
 {
 


@@ -122,8 +122,8 @@ class WXDLLEXPORT wxComboBox : public wxChoice,
                                       );
 
 private:
                                       );
 
 private:

-    // implement wxTextEntry pure virtual: it implements all the operations for
-    // the simple EDIT controls
+    // implement wxTextEntry pure virtual methods
+    virtual wxWindow *GetEditableWindow() { return this; }

     virtual WXHWND GetEditHWND() const { return m_hWnd; }
 
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     virtual WXHWND GetEditHWND() const { return m_hWnd; }
 
     DECLARE_DYNAMIC_CLASS(wxComboBox)