From 6403484578149a9ed8d40f38cb21d311b79a33ac Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 13 Nov 2007 12:49:38 +0000 Subject: [PATCH] wxChar -> char git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/bmpbuttn.h | 2 +- include/wx/mac/carbon/button.h | 2 +- include/wx/mac/carbon/choice.h | 2 +- include/wx/mac/carbon/combobox.h | 2 +- include/wx/mac/carbon/dialog.h | 2 +- include/wx/mac/carbon/frame.h | 2 +- include/wx/mac/carbon/gauge.h | 2 +- include/wx/mac/carbon/mdi.h | 2 +- include/wx/mac/carbon/slider.h | 2 +- include/wx/mac/carbon/statbox.h | 2 +- include/wx/mac/carbon/toolbar.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h index c5f9e64e26..3e30334b32 100644 --- 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 126e3ad6c5..9fad666a4e 100644 --- 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 3a5337440e..04946ff285 100644 --- 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 6614099e2f..c38095768d 100644 --- 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 fab1aabaec..4b3827bea0 100644 --- 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 30706e3e48..239cd4db5a 100644 --- 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 b75005c4b7..d2c7340d51 100644 --- 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 32772a754b..7b2c2cda17 100644 --- 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 fa507b201d..5e176c61d3 100644 --- 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 f0b2bbd7b2..92b781ee5b 100644 --- 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 00d7309b30..95987b58a0 100644 --- 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 { -- 2.45.2