removed wxSTRING_TEXT() macro in favour of wxS()

[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 838da21dc0777b2b4ebb93694005e32a1f0212b6..04946ff285fea912a675ce95d3832bc0b3bf6ea7 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 char) wxChoiceNameStr[];

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


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

-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-

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


@@ -82,6 +79,9 @@ public:
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:

+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+

     virtual wxSize DoGetBestSize() const ;
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
     virtual wxSize DoGetBestSize() const ;
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,