Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index f95d442a2f0783ad08021153265a120889064aa6..233d0f0d027505119c39a59500699acfa9d4941b 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/os2/combobox.h

 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:


@@ -96,6 +96,10 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
                 ,const wxString&      rsName = wxComboBoxNameStr
                );
 
                 ,const wxString&      rsName = wxComboBoxNameStr
                );
 

+    // See wxComboBoxBase discussion of IsEmpty().
+    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+

     // resolve ambiguities among virtual functions inherited from both base
     // classes
     virtual void Clear();
     // resolve ambiguities among virtual functions inherited from both base
     // classes
     virtual void Clear();


@@ -122,8 +126,8 @@ class WXDLLIMPEXP_CORE 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)