destroy m_impl even if an exception is thrown from the main loop

[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..57f765da1bd968729fcc7f7ce349e97607332866 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,32 +69,28 @@ 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 Delete(unsigned int n);

     virtual void Clear();
 
     virtual void Clear();
 

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

     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);

-    int GetCurrentSelection() const { return GetSelection(); }

 
     virtual int FindString(const wxString& s, bool bCase = false) const;
 
     virtual int FindString(const wxString& s, bool bCase = false) const;

-    virtual wxString GetString(int n) const ;
-    virtual void SetString( int , const wxString& s ) ;
+    virtual wxString GetString(unsigned int n) const ;
+    virtual void SetString(unsigned int pos, const wxString& s);

     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;

+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, unsigned 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(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned 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();