Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index 829843be36a71743558ed2aae8b869294f8736b9..720b9c509d543473695d9aaae2f136a9951e0439 100644 (file)
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/choice.h
+// Name:        wx/osx/choice.h

 // Purpose:     wxChoice class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxChoice class
 // Author:      Stefan Csomor
 // Modified by:


@@ -17,8 +17,6 @@
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[];
-

 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item


@@ -77,8 +75,8 @@ public:
     virtual wxString GetString(unsigned int n) const ;
     virtual void SetString(unsigned int pos, const wxString& s);
     // osx specific event handling common for all osx-ports
     virtual wxString GetString(unsigned int n) const ;
     virtual void SetString(unsigned int pos, const wxString& s);
     // osx specific event handling common for all osx-ports

-    
-    virtual bool        HandleClicked( double timestampsec );
+
+    virtual bool        OSXHandleClicked( double timestampsec );

 
 protected:
     virtual void DoDeleteOneItem(unsigned int n);
 
 protected:
     virtual void DoDeleteOneItem(unsigned int n);


@@ -95,6 +93,10 @@ protected:
     wxArrayString m_strings;
     wxChoiceDataArray m_datas ;
     wxMenu*    m_popUpMenu ;
     wxArrayString m_strings;
     wxChoiceDataArray m_datas ;
     wxMenu*    m_popUpMenu ;

+
+private:
+    // This should be called when the number of items in the control changes.
+    void DoAfterItemCountChange();

 };
 
 #endif
 };
 
 #endif