added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 279e80d7fb79a0beede6ef4e3367ca63611e06b7..95a7154bcbb289b14bd59304bf338c4efb50ad2b 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -10,7 +10,7 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "choice.h"
 #endif
 
@@ -60,6 +60,7 @@ protected:
 
     void ApplyWidgetStyle();
     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;
@@ -68,9 +69,10 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
 private:
     // common part of Create() and DoAppend()
-    size_t GtkAppendHelper(GtkWidget *menu, const wxString& item);
+    int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)