Don't interpret '&' specially in wxTextWrapper.

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

diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index c69ab6693157c21785998caeeaa7e3982a750ff5..3e8898373c63d40c2b7273d9fb2e2237615a9179 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:
@@ -17,8 +17,6 @@
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[];
-
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item
@@ -77,7 +75,7 @@ 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 bool        OSXHandleClicked( double timestampsec );
 
 protected: