GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index a2d019541823db6cab2923b5fcbe91075b5d321d..e2ce50b03cc152c2d851fa44c9bea971ac650248 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -12,12 +12,10 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "choice.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
 #include "wx/clntdata.h"
 #include "wx/dynarray.h"
 
@@ -55,6 +53,7 @@ public:
     // implementation of wxControlWithItems
     virtual int GetCount() const;
     virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
     virtual void DoSetItemClientData(int n, void* clientData);
     virtual void* DoGetItemClientData(int n) const;
     virtual void DoSetItemClientObject(int n, wxClientData* clientData);