Don't redefine symbols already defined in latest MinGW headers.

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 8339b4cb0c65b635f51d0414760eb607bc20e826..4f4a99458b980d5418c4bb5bba2f3ed39b9f99c5 100644 (file)
--- 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);
 
                 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();
     // resolve ambiguities among virtual functions inherited from both base
     // classes
     virtual void Clear();


@@ -82,7 +86,8 @@ public:
     virtual void SetValue(const wxString& value);
     virtual wxString GetStringSelection() const
         { return wxChoice::GetStringSelection(); }
     virtual void SetValue(const wxString& value);
     virtual wxString GetStringSelection() const
         { return wxChoice::GetStringSelection(); }

-
+    virtual void Popup() { MSWDoPopupOrDismiss(true); }
+    virtual void Dismiss() { MSWDoPopupOrDismiss(false); }

     virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
     virtual void SetSelection(long from, long to)
         { wxTextEntry::SetSelection(from, to); }
     virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
     virtual void SetSelection(long from, long to)
         { wxTextEntry::SetSelection(from, to); }


@@ -125,6 +130,7 @@ protected:
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif

+    void MSWDoPopupOrDismiss(bool show);

 
     // this is the implementation of GetEditHWND() which can also be used when
     // we don't have the edit control, it simply returns NULL then
 
     // this is the implementation of GetEditHWND() which can also be used when
     // we don't have the edit control, it simply returns NULL then