X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1d1f8175d3f71a4f021ffa8d255f80a05eaffd0..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/combobox.h

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index f656e081e8..ac803c17ed 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -75,6 +75,10 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = 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();
@@ -88,6 +92,7 @@ public:
     virtual void SetSelection(long from, long to)
         { wxTextEntry::SetSelection(from, to); }
     virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual bool ContainsHWND(WXHWND hWnd) const;
     virtual void GetSelection(long *from, long *to) const;
 
     virtual bool IsEditable() const;
@@ -126,7 +131,8 @@ protected:
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif
-    void MSWDoPopupOrDismiss(bool show);
+
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
     // this is the implementation of GetEditHWND() which can also be used when
     // we don't have the edit control, it simply returns NULL then