ensure that dialog gripper is always positioned below the other children, even if...

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

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index a2d92924308a9f43be3e01a01877a5bb82fb4f24..2b26eb5180bf2427f7cf9f23dc1a45fc0d371c14 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
 // wxComboBox: a combination of text control and a listbox
 // ----------------------------------------------------------------------------
 
 // wxComboBox: a combination of text control and a listbox
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxComboBox : public wxComboCtrl, public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxComboBoxBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -147,11 +147,7 @@ public:
 
     // we delegate our client data handling to wxListBox which we use for the
     // items, so override this and other methods dealing with the client data
 
     // we delegate our client data handling to wxListBox which we use for the
     // items, so override this and other methods dealing with the client data

-    virtual wxClientDataType GetClientDataType() const
-    {
-        return GetLBox()->GetClientDataType();
-    }
-
+    virtual wxClientDataType GetClientDataType() const;

     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 protected:
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 protected: