Remove some old redundant code

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index e7e3598ed691469ae16e38f578d8a65b73d3cb76..15f2249a869d989ea49b3cc91b6ac187c5ace430 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -69,6 +68,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();
@@ -101,6 +104,10 @@ public:
     WXWidget GetTopWidget() const { return m_mainWidget; }
     WXWidget GetMainWidget() const { return m_mainWidget; }
 
+   //Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it.
+    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
+    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
+
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSize(int x, int y,