Changed control name constants from wxChar to char according to revision 49873

        (applying patch #1833732).

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index e7e2dfef31babd72fcaad41b1936409bfad0e803..b4b4467ac725db6723ffbf367b5f2f3028d79a9e 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -15,7 +15,7 @@
 #include "wx/button.h"
 #include "wx/dcclient.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 4a0d30a3f27d155f5ea0db14e9d6b90a47d345ab..52137153feb9bce15dedc5d8155a6597ae4ffaf6 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/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 wxDialogModalData;
 

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 2dc0f10f7f49f144d7f35528e602328eef727480..6e8ffebd534c22530e59ed5a3b9add1e4b0709ad 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -94,36 +94,36 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
 //
 // Controls
 //
-WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxListBoxNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxStaticLineNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxStaticTextNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxPanelNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxRadioBoxNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxRadioButtonNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxGetTextFromUserPromptStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorDefaultWildcardStr[];
+WXDLLEXPORT_DATA(extern const char)   wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxCheckBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxChoiceNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxComboBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxDialogNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxGaugeNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxListBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticLineNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticTextNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticBitmapNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxPanelNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxRadioBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxRadioButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxBitmapRadioButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxScrollBarNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxSliderNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxTextCtrlNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxToolBarNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStatusLineNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxGetTextFromUserPromptStr[];
+WXDLLEXPORT_DATA(extern const char)   wxMessageBoxCaptionStr[];
+WXDLLEXPORT_DATA(extern const char)   wxFileSelectorPromptStr[];
+WXDLLEXPORT_DATA(extern const char)   wxFileSelectorDefaultWildcardStr[];
 WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr;
-WXDLLEXPORT_DATA(extern const wxChar) wxTreeCtrlNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogNameStr[];
-WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogDefaultFolderStr[];
+WXDLLEXPORT_DATA(extern const char)   wxTreeCtrlNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxDirDialogNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxDirDialogDefaultFolderStr[];
 
 //
 // Class names