explain why do you need wxUSE_WXDIB

[wxWidgets.git] / include / wx / mac / carbon / choice.h

diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index 901702ed00d3d02fc2ec98226f8d82668daadc3d..3dbe9c23af1bcc6ccd977286a6f2bd3f81ba41f9 100644 (file)
--- a/include/wx/mac/carbon/choice.h
+++ b/include/wx/mac/carbon/choice.h
@@ -17,7 +17,7 @@
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];

 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 


@@ -69,13 +69,10 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 

-    // implement base class pure virtuals
-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);

     virtual void Delete(int n);
     virtual void Clear();
 
     virtual void Delete(int n);
     virtual void Clear();
 

-    virtual int GetCount() const ;
+    virtual size_t GetCount() const ;

     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
     int GetCurrentSelection() const { return GetSelection(); }
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
     int GetCurrentSelection() const { return GetSelection(); }


@@ -87,14 +84,14 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;

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

 
 

-public: // for wxComboBox only

     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;
 

-protected:

     // free all memory we have (used by Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()
     void FreeData();
     // free all memory we have (used by Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()
     void FreeData();