Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.

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

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index 5b73bc2b6b45f3d53e3d6951574c793a3de4ea2c..e07db8a96251f2a463f3fe3078e7dec07660db5b 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "combobox.h"
 #endif
 
 #pragma interface "combobox.h"
 #endif
 


@@ -20,10 +20,9 @@
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 // Combobox item
 
 // Combobox item

-class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
+class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase

 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 


@@ -96,6 +95,8 @@ class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
     virtual int GetCount() const { return m_choice->GetCount() ; }
     void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
     virtual int GetCount() const { return m_choice->GetCount() ; }
     void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 

+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
+

 protected:
     virtual int DoAppend(const wxString& item) ;
     virtual int DoInsert(const wxString& item, int pos) ;
 protected:
     virtual int DoAppend(const wxString& item) ;
     virtual int DoInsert(const wxString& item, int pos) ;