allow wxFileConfig be created with empty name (will take it from wxApp) (patch 749749)

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index a58c6bb5830345a6cec554072243727a7e2bfc1f..5f550d732a5f31bab5d10f6b45b4d984253625dc 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/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
 


@@ -55,25 +55,23 @@ public:
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     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 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 wxSize DoGetBestSize() const;
+

 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)