support retina display

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 8b3e8b9e453d0007175c78b4e0ff484a6152980b..fdcb802d3116b46b3a550e9e01ad0dfd35f06424 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -16,7 +16,7 @@
 #include "wx/textentry.h"
 
 // Combobox item
 #include "wx/textentry.h"
 
 // Combobox item

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

                                public wxTextEntry
 {
 public:
                                public wxTextEntry
 {
 public:


@@ -69,6 +69,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();


@@ -101,12 +105,18 @@ public:
     WXWidget GetTopWidget() const { return m_mainWidget; }
     WXWidget GetMainWidget() const { return m_mainWidget; }
 
     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,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

+    // implement wxTextEntry pure virtual methods
+    virtual wxWindow *GetEditableWindow() { return this; }

     virtual WXWidget GetTextWidget() const;
 
 private:
     virtual WXWidget GetTextWidget() const;
 
 private: