wxChar -> char

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h
index c5f9e64e26849f6513a900c9258e31476fc8db3f..3e30334b32bb0cefe13d1593de0f88cac505bc0c 100644 (file)
--- a/include/wx/mac/carbon/bmpbuttn.h
+++ b/include/wx/mac/carbon/bmpbuttn.h
@@ -14,7 +14,7 @@
 
 #include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h
index 126e3ad6c5f38a143fdb1eaf95c5fb03eb93886b..9fad666a4e0e8f1cf0d3f80230989ffc78f889d5 100644 (file)
--- a/include/wx/mac/carbon/button.h
+++ b/include/wx/mac/carbon/button.h
@@ -15,7 +15,7 @@
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
 
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase

diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index 3a5337440e15a9105c8fc1734728a2aad0d2ad1e..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"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxChoiceNameStr[];
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 6614099e2f494885091a134367f1d609efbd09b7..c38095768dc6a5a7be00fbe18c07d8fd99c1885d 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -15,7 +15,7 @@
 #include "wx/containr.h"
 #include "wx/choice.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[];
 
 // forward declaration of private implementation classes
 

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index fab1aabaecfb5acc63b27d4d29972e6461239f93..4b3827bea0221fec586d1644cab67db7910ad002 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxDialogNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 

diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index 30706e3e481f702cdd78fb782313dcb971af8de4..239cd4db5a3ed4727ac48afb30ff689380df7cb4 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -17,7 +17,7 @@
 #include "wx/accel.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxMenuBar;
 class WXDLLIMPEXP_FWD_CORE wxStatusBar;

diff --git a/include/wx/mac/carbon/gauge.h b/include/wx/mac/carbon/gauge.h
index b75005c4b782c21b5c5ce424860565b50e5c417f..d2c7340d518ed5f71ce6504175c52b5daaddc448 100644 (file)
--- a/include/wx/mac/carbon/gauge.h
+++ b/include/wx/mac/carbon/gauge.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge: public wxGaugeBase

diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index 32772a754bec05585c3e389a15f93eefac119c36..7b2c2cda179baf6d411ea22cf2e9fdfc5e8dcd13 100644 (file)
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -16,7 +16,7 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxStatusLineNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
 class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index fa507b201d1e43f3d669a1bd77987ba913793bb4..5e176c61d382654df73871a0fdccf47c0edfff68 100644 (file)
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -16,7 +16,7 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxSliderNameStr[];
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase

diff --git a/include/wx/mac/carbon/statbox.h b/include/wx/mac/carbon/statbox.h
index f0b2bbd7b20c1beea5a977e2cc1a67e5cbd8fa66..92b781ee5bc05cee0846dc1374a1c9ce372e7087 100644 (file)
--- a/include/wx/mac/carbon/statbox.h
+++ b/include/wx/mac/carbon/statbox.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxStaticBoxNameStr[];
 
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl

diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 00d7309b30aadf4272425372375d3a5f92e3e7bc..95987b58a09c649ff59600d52a88edd30a9aef56 100644 (file)
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -17,7 +17,7 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {