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 ba5528bbfc8f0f69cc110ff12fcbcec5e9939557..95a7154bcbb289b14bd59304bf338c4efb50ad2b 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -10,7 +10,7 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 

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

     #pragma interface "choice.h"
 #endif
 
     #pragma interface "choice.h"
 #endif
 


@@ -51,38 +51,28 @@ public:
     void SetSelection( int n );
 
     virtual int GetCount() const;
     void SetSelection( int n );
 
     virtual int GetCount() const;

-    int FindString( const wxString &string ) const;
+    int FindString( const wxString& string ) const;

     wxString GetString( int n ) const;
     wxString GetString( int n ) const;

+    void SetString( int n, const wxString& string );

 
 

-    // implementation
+protected:

     wxList m_clientList;    // contains the client data for the items
 
     wxList m_clientList;    // contains the client data for the items
 

-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

-
-protected:

     virtual int DoAppend(const wxString& item);
     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 );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;

 
 

-    virtual void DoSetClientData( int n, void* clientData );
-    virtual void* DoGetClientData( int n ) const;
-    virtual void DoSetClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetClientObject( int n ) const;
-
-    // the above virtuals hide these virtuals in wxChoiceBase
-    virtual void DoSetClientData(void* clientData )
-        { wxWindowBase::DoSetClientData(clientData); };
-    virtual void* DoGetClientData() const
-        { return(wxWindowBase::DoGetClientData()); };
-    virtual void DoSetClientObject( wxClientData* clientData )
-        { wxWindowBase::DoSetClientObject(clientData); };
-    virtual wxClientData* DoGetClientObject() const
-        { return(wxWindowBase::DoGetClientObject()); };
+    virtual wxSize DoGetBestSize() const;

 
 

+    virtual bool IsOwnGtkWindow( GdkWindow *window );

 private:
     // common part of Create() and DoAppend()
 private:
     // common part of Create() and DoAppend()

-    size_t AppendHelper(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)
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)