From f36e602b3f4cccedfa2d8932c288f3dfed7b549e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Nov 2007 21:37:46 +0000 Subject: [PATCH] make various control names constants of type char, not wxChar, as this is more compatible with the old ANSI build and it doesn't make much sense to use wchar_t for ASCII strings anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/bmpbuttn.h | 2 +- include/wx/button.h | 2 +- include/wx/checkbox.h | 2 +- include/wx/choice.h | 2 +- include/wx/clrpicker.h | 4 +-- include/wx/combobox.h | 2 +- include/wx/control.h | 2 +- include/wx/dialog.h | 2 +- include/wx/dirdlg.h | 6 ++-- include/wx/filedlg.h | 6 ++-- include/wx/filepicker.h | 18 +++++----- include/wx/fontpicker.h | 4 +-- include/wx/frame.h | 4 +-- include/wx/gauge.h | 2 +- include/wx/gdicmn.h | 2 +- include/wx/generic/combo.h | 2 +- include/wx/generic/dirdlgg.h | 4 +-- include/wx/generic/filectrlg.h | 2 +- include/wx/generic/mdig.h | 2 +- include/wx/generic/panelg.h | 2 +- include/wx/generic/textdlgg.h | 4 +-- include/wx/gtk/dialog.h | 14 -------- include/wx/gtk/filectrl.h | 2 +- include/wx/gtk/tglbtn.h | 2 +- include/wx/gtk1/button.h | 13 -------- include/wx/gtk1/combobox.h | 2 +- include/wx/gtk1/dialog.h | 14 -------- include/wx/gtk1/gauge.h | 22 ------------- include/wx/gtk1/mdi.h | 2 +- include/wx/gtk1/tglbtn.h | 2 +- include/wx/listbox.h | 2 +- include/wx/listctrl.h | 2 +- include/wx/msgdlg.h | 2 +- include/wx/msw/dialog.h | 4 +-- include/wx/msw/gauge95.h | 2 +- include/wx/msw/mdi.h | 2 +- include/wx/msw/statbmp.h | 2 +- include/wx/msw/tabctrl.h | 2 -- include/wx/msw/tglbtn.h | 2 +- include/wx/notebook.h | 2 +- include/wx/os2/tglbtn.h | 2 +- include/wx/pickerbase.h | 2 +- include/wx/radiobox.h | 2 +- include/wx/radiobut.h | 2 +- include/wx/scrolbar.h | 2 +- include/wx/slider.h | 2 +- include/wx/srchctrl.h | 2 +- include/wx/statbmp.h | 2 +- include/wx/statbox.h | 2 +- include/wx/statline.h | 2 +- include/wx/stattext.h | 2 +- include/wx/tbarbase.h | 2 +- include/wx/textctrl.h | 2 +- include/wx/toplevel.h | 2 +- include/wx/treebase.h | 2 +- include/wx/univ/dialog.h | 2 +- include/wx/univ/tglbtn.h | 2 +- src/common/choiccmn.cpp | 2 +- src/common/clrpickercmn.cpp | 4 +-- src/common/ctrlcmn.cpp | 2 +- src/common/datacmn.cpp | 60 +++++++++++++++++----------------- src/common/filepickercmn.cpp | 12 +++---- src/common/fontpickercmn.cpp | 4 +-- src/common/gaugecmn.cpp | 2 +- src/common/listctrlcmn.cpp | 2 +- src/common/srchcmn.cpp | 2 +- src/generic/dirctrlg.cpp | 2 +- src/generic/textdlgg.cpp | 4 +-- 68 files changed, 118 insertions(+), 183 deletions(-) diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 84a94863da..990f3f3842 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -19,7 +19,7 @@ #include "wx/bitmap.h" #include "wx/button.h" -extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. diff --git a/include/wx/button.h b/include/wx/button.h index 0959a68e37..bf32419366 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -47,7 +47,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; -extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxButton: a push button diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 0fa2516ca3..47ba77a0e2 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -49,7 +49,7 @@ enum wxCheckBoxState }; -extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxCheckBox: a control which shows a label and a box which may be checked diff --git a/include/wx/choice.h b/include/wx/choice.h index 164aac07a5..69cab9702e 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -26,7 +26,7 @@ // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxChoiceNameStr[]; // ---------------------------------------------------------------------------- // wxChoice allows to select one of a non-modifiable list of strings diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 151693bc07..efd635bee3 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; -extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[]; // show the colour in HTML form (#AABBCC) as colour button label #define wxCLRBTN_SHOW_LABEL 100 diff --git a/include/wx/combobox.h b/include/wx/combobox.h index bc33a141c7..ac02a10a32 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -16,7 +16,7 @@ #if wxUSE_COMBOBOX -extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; // ---------------------------------------------------------------------------- // wxComboBoxBase: this interface defines the methods wxComboBox must implement diff --git a/include/wx/control.h b/include/wx/control.h index 7a70a4c156..fcc3b923f8 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -22,7 +22,7 @@ #include "wx/window.h" // base class -extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxControlNameStr[]; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls diff --git a/include/wx/dialog.h b/include/wx/dialog.h index fe52966b04..271c0c32be 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer; #define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX) #endif -extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 04edeebdc8..46dfd1bda2 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -20,9 +20,9 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; #define wxDD_CHANGE_DIR 0x0100 #define wxDD_DIR_MUST_EXIST 0x0200 diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 86415900cf..afe838b461 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -58,9 +58,9 @@ enum #define wxFD_DEFAULT_STYLE wxFD_OPEN -extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; //---------------------------------------------------------------------------- // wxFileDialogBase diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index a71f69f9ea..8060a3f8dd 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -22,15 +22,15 @@ class WXDLLIMPEXP_FWD_CORE wxDialog; class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent; -extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerCtrlNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; - -extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetLabel[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerCtrlNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetLabel[]; +extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFilePickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; + +extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetLabel[]; +extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirPickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; // ---------------------------------------------------------------------------- diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index 14da2fffc2..51b4a21766 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent; -extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFontPickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFontPickerCtrlNameStr[]; // ---------------------------------------------------------------------------- diff --git a/include/wx/frame.h b/include/wx/frame.h index 7294b98ff6..3c2c3888d8 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -19,8 +19,8 @@ #include "wx/toplevel.h" // the base class // the default names for various classs -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxMenuBar; diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 61dd3fa1f6..2156e05a87 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -41,7 +41,7 @@ #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0 #endif -extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[]; // ---------------------------------------------------------------------------- // wxGauge: a progress bar diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index e25aaa4336..6817f38649 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -829,7 +829,7 @@ extern WXDLLEXPORT_DATA(wxIconBundle) wxNullIconBundle; extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase; -extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[]; extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h index 8ed30e4e32..fc7bb10882 100644 --- a/include/wx/generic/combo.h +++ b/include/wx/generic/combo.h @@ -31,7 +31,7 @@ #endif -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase { diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 71884b63ce..96dd920354 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_FWD_CORE wxTreeEvent; // we may be included directly as well as from wx/dirdlg.h (FIXME) -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; #ifndef wxDD_DEFAULT_STYLE #ifdef __WXWINCE__ diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h index 3bf08570ba..c2696f35ec 100644 --- a/include/wx/generic/filectrlg.h +++ b/include/wx/generic/filectrlg.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoice; class WXDLLIMPEXP_FWD_CORE wxStaticText; class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; //----------------------------------------------------------------------------- // wxFileData - a class to hold the file info for the wxFileListCtrl diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 39c2ee2ff2..d43fc4130c 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -20,7 +20,7 @@ #include "wx/panel.h" #include "wx/notebook.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index b41701eaa5..b5d5553814 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxControlContainer; -extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[]; // ---------------------------------------------------------------------------- // wxPanel contains other controls and implements TAB traversal between them diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index a0f8fbcf3b..55e290eaae 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -25,8 +25,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxGetTextFromUserPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxGetPasswordFromUserPromptStr[]; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 8d7e7a33fc..7b73b3b52d 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -11,20 +11,6 @@ #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDialog; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[]; - //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h index c38c4debe0..9192a5987b 100644 --- a/include/wx/gtk/filectrl.h +++ b/include/wx/gtk/filectrl.h @@ -16,7 +16,7 @@ #include "wx/control.h" #include "wx/filectrl.h" -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; typedef struct _GtkFileChooser GtkFileChooser; diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index 3b205fde28..4c1f5f59b8 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[]; //----------------------------------------------------------------------------- // wxToggleBitmapButton diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index f3d0169639..a9b753f093 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -13,19 +13,6 @@ #include "wx/defs.h" #include "wx/object.h" #include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[]; //----------------------------------------------------------------------------- // wxButton diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 13b7b24c55..56c7709c88 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox; // global data //----------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h index 7a1cff23d1..fb78c8c440 100644 --- a/include/wx/gtk1/dialog.h +++ b/include/wx/gtk1/dialog.h @@ -11,20 +11,6 @@ #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDialog; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[]; - //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index 42b516e2bf..680e6690c4 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -10,26 +10,6 @@ #ifndef __GTKGAUGEH__ #define __GTKGAUGEH__ -#include "wx/defs.h" - -#if wxUSE_GAUGE - -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGauge; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[]; - //----------------------------------------------------------------------------- // wxGaugeBox //----------------------------------------------------------------------------- @@ -97,7 +77,5 @@ private: DECLARE_DYNAMIC_CLASS(wxGauge) }; -#endif - #endif // __GTKGAUGEH__ diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index abcf72f1cd..94ff72e894 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // global data //----------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- // wxMDIParentFrame diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h index 9e77ce425b..c850670efa 100644 --- a/include/wx/gtk1/tglbtn.h +++ b/include/wx/gtk1/tglbtn.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[]; //----------------------------------------------------------------------------- // wxToggleBitmapButton diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 01604e47f6..cab8df6d63 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[]; // ---------------------------------------------------------------------------- // wxListBox interface is defined by the class wxListBoxBase diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index f8385b6ab5..db57cf04df 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -22,7 +22,7 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[]; // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 2efa9a4527..60493ecb7c 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -18,7 +18,7 @@ #include "wx/dialog.h" -WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[]; +WXDLLEXPORT_DATA(extern const char) wxMessageBoxCaptionStr[]; class WXDLLEXPORT wxMessageDialogBase : public wxDialog { diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index e153f291db..b228a6b477 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -14,13 +14,13 @@ #include "wx/panel.h" -extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxDialogModalData; #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) class WXDLLIMPEXP_FWD_CORE wxToolBar; -extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; #endif // Dialog boxes diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h index d595242620..26919abfd7 100644 --- a/include/wx/msw/gauge95.h +++ b/include/wx/msw/gauge95.h @@ -14,7 +14,7 @@ #if wxUSE_GAUGE -extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[]; // Group box class WXDLLEXPORT wxGauge95 : public wxGaugeBase diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 8366985ec7..93cede426a 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -14,7 +14,7 @@ #include "wx/frame.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 7086e812dd..ba494939a7 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -16,7 +16,7 @@ #include "wx/icon.h" #include "wx/bitmap.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 29b57c4b5b..5047f96afc 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -14,8 +14,6 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; -// extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; - /* * Flags returned by HitTest */ diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index 9c3ef03c93..02650d58ed 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -13,7 +13,7 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; // Checkbox item (single checkbox) class WXDLLEXPORT wxToggleButton : public wxControl diff --git a/include/wx/notebook.h b/include/wx/notebook.h index f94e516227..5a806798a4 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -54,7 +54,7 @@ enum typedef wxWindow wxNotebookPage; // so far, any window can be a page -extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[]; // ---------------------------------------------------------------------------- // wxNotebookBase: define wxNotebook interface diff --git a/include/wx/os2/tglbtn.h b/include/wx/os2/tglbtn.h index 02344bb771..4c537db355 100644 --- a/include/wx/os2/tglbtn.h +++ b/include/wx/os2/tglbtn.h @@ -13,7 +13,7 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; // Checkbox item (single checkbox) class WXDLLEXPORT wxToggleButton : public wxControl diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index b7a696d7eb..e8c6cf0d8e 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_FWD_CORE wxToolTip; -extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxPickerBase is the base class for the picker controls which support diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index a91b8c5ebd..751717d3d1 100644 --- a/include/wx/radiobox.h +++ b/include/wx/radiobox.h @@ -26,7 +26,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray); #endif // wxUSE_TOOLTIPS -extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[]; // ---------------------------------------------------------------------------- // wxRadioBoxBase is not a normal base class, but rather a mix-in because the diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h index 2df27e03f7..831655702e 100644 --- a/include/wx/radiobut.h +++ b/include/wx/radiobut.h @@ -33,7 +33,7 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[]; #if defined(__WXUNIVERSAL__) #include "wx/univ/radiobut.h" diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index be108b18f9..fc46906736 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -18,7 +18,7 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[]; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control diff --git a/include/wx/slider.h b/include/wx/slider.h index 3d775be237..99167e7474 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -45,7 +45,7 @@ #define wxSL_NOTIFY_DRAG 0x0000 #endif // WXWIN_COMPATIBILITY_2_6 -extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[]; // ---------------------------------------------------------------------------- // wxSliderBase: define wxSlider interface diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index 386e849872..2fd1170180 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -37,7 +37,7 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[]; BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119) diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 73f773c9f8..24281700b4 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -20,7 +20,7 @@ #include "wx/bitmap.h" #include "wx/icon.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl diff --git a/include/wx/statbox.h b/include/wx/statbox.h index efeeee65b2..039df42af3 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -18,7 +18,7 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[]; // ---------------------------------------------------------------------------- // wxStaticBox: a grouping box with a label diff --git a/include/wx/statline.h b/include/wx/statline.h index 6b43415c84..b1046d6d5e 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -28,7 +28,7 @@ // ---------------------------------------------------------------------------- // the default name for objects of class wxStaticLine -extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[]; // ---------------------------------------------------------------------------- // wxStaticLine - a line in a dialog diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 3a1c6cb047..05059831bb 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -29,7 +29,7 @@ #define wxST_ELLIPSIZE_END 0x0010 -extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[]; class WXDLLEXPORT wxStaticTextBase : public wxControl { diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 47ccd84a01..34928b79f6 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 75ad314bc1..97a7fe83f5 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -55,7 +55,7 @@ typedef long wxTextCoord; // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[]; // this is intentionally not enum to avoid warning fixes with // typecasting from enum type to wxTextCoord diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 1a20a04658..e770e8fee2 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -23,7 +23,7 @@ #include "wx/containr.h" // the default names for various classes -extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[]; class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; diff --git a/include/wx/treebase.h b/include/wx/treebase.h index c706914558..991a856fad 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -220,7 +220,7 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | wxTREE_HITTEST_ONITEMLABEL; // tree ctrl default name -extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[]; // ---------------------------------------------------------------------------- // wxTreeItemAttr: a structure containing the visual attributes of an item diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index 02efd9193a..1579a3744e 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -11,7 +11,7 @@ #ifndef _WX_UNIV_DIALOG_H_ #define _WX_UNIV_DIALOG_H_ -extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; class WXDLLIMPEXP_FWD_CORE wxEventLoop; diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h index 9b03805b52..35d3667e0e 100644 --- a/include/wx/univ/tglbtn.h +++ b/include/wx/univ/tglbtn.h @@ -14,7 +14,7 @@ #include "wx/button.h" -extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxToggleButton: a push button diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index db5fea5e20..6685fda3cf 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -31,7 +31,7 @@ #ifndef WX_PRECOMP #endif -const wxChar wxChoiceNameStr[] = wxT("choice"); +const char wxChoiceNameStr[] = "choice"; // ============================================================================ // implementation diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp index 7349262a53..5cbd6a7058 100644 --- a/src/common/clrpickercmn.cpp +++ b/src/common/clrpickercmn.cpp @@ -32,8 +32,8 @@ #include "wx/textctrl.h" #endif -const wxChar wxColourPickerCtrlNameStr[] = wxT("colourpicker"); -const wxChar wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget"); +const char wxColourPickerCtrlNameStr[] = "colourpicker"; +const char wxColourPickerWidgetNameStr[] = "colourpickerwidget"; // ============================================================================ // implementation diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 1a026c4e39..3e4fbb119f 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -36,7 +36,7 @@ #include "wx/utils.h" // for wxStripMenuCodes() #endif -const wxChar wxControlNameStr[] = wxT("control"); +const char wxControlNameStr[] = "control"; // ============================================================================ // implementation diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp index fdc0a9a740..10baf57320 100644 --- a/src/common/datacmn.cpp +++ b/src/common/datacmn.cpp @@ -39,45 +39,45 @@ wxAcceleratorTable wxNullAcceleratorTable; #endif // wxUSE_ACCEL // Default window names -extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button"); -extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check"); -extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[] = wxT("comboBox"); -extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog"); -extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame"); -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox"); -extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox"); -extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[] = wxT("staticLine"); -extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText"); -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap"); -extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[] = wxT("notebook"); -extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[] = wxT("panel"); -extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[] = wxT("radioBox"); -extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[] = wxT("radioButton"); -extern WXDLLEXPORT_DATA(const wxChar) wxBitmapRadioButtonNameStr[] = wxT("radioButton"); -extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[] = wxT("scrollBar"); -extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[] = wxT("slider"); -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line"); -extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text"); -extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl"); -extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar"); +extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button"; +extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check"; +extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox"; +extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog"; +extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame"; +extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox"; +extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox"; +extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine"; +extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText"; +extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap"; +extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook"; +extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel"; +extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox"; +extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton"; +extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton"; +extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar"; +extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider"; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line"; +extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text"; +extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl"; +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar"; // Default messages -extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message"); -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file"); -extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[] = wxT("Select a directory"); +extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message"; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file"; +extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory"; // Other default strings -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] = +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] = #if defined(__WXMSW__) || defined(__OS2__) - wxT("*.*") + "*.*" #else // Unix/Mac - wxT("*") + "*" #endif ; -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl"); -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/"); +extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl"; +extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/"; -extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[] = wxT("filedlg"); +extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg"; #if defined(__WXMSW__) || defined(__OS2__) WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT"); #endif diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp index 97e1913b34..bec014f6b4 100644 --- a/src/common/filepickercmn.cpp +++ b/src/common/filepickercmn.cpp @@ -37,12 +37,12 @@ // implementation // ============================================================================ -const wxChar wxFilePickerCtrlNameStr[] = wxT("filepicker"); -const wxChar wxFilePickerWidgetNameStr[] = wxT("filepickerwidget"); -const wxChar wxDirPickerCtrlNameStr[] = wxT("dirpicker"); -const wxChar wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget"); -const wxChar wxFilePickerWidgetLabel[] = wxT("Browse"); -const wxChar wxDirPickerWidgetLabel[] = wxT("Browse"); +const char wxFilePickerCtrlNameStr[] = "filepicker"; +const char wxFilePickerWidgetNameStr[] = "filepickerwidget"; +const char wxDirPickerCtrlNameStr[] = "dirpicker"; +const char wxDirPickerWidgetNameStr[] = "dirpickerwidget"; +const char wxFilePickerWidgetLabel[] = "Browse"; +const char wxDirPickerWidgetLabel[] = "Browse"; DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED) diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp index 3ca7872f1d..cc1dd50bbe 100644 --- a/src/common/fontpickercmn.cpp +++ b/src/common/fontpickercmn.cpp @@ -39,8 +39,8 @@ // implementation // ============================================================================ -const wxChar wxFontPickerCtrlNameStr[] = wxT("fontpicker"); -const wxChar wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget"); +const char wxFontPickerCtrlNameStr[] = "fontpicker"; +const char wxFontPickerWidgetNameStr[] = "fontpickerwidget"; DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED) IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase) diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp index a41d08ef3e..5bfe90f182 100644 --- a/src/common/gaugecmn.cpp +++ b/src/common/gaugecmn.cpp @@ -31,7 +31,7 @@ #include "wx/gauge.h" -const wxChar wxGaugeNameStr[] = wxT("gauge"); +const char wxGaugeNameStr[] = "gauge"; // ============================================================================ // implementation diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp index 41f5f553cb..22b5661be6 100644 --- a/src/common/listctrlcmn.cpp +++ b/src/common/listctrlcmn.cpp @@ -23,7 +23,7 @@ #include "wx/listctrl.h" -const wxChar wxListCtrlNameStr[] = wxT("listCtrl"); +const char wxListCtrlNameStr[] = "listCtrl"; // ListCtrl events DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG) diff --git a/src/common/srchcmn.cpp b/src/common/srchcmn.cpp index 8cdbaf7e0a..3f5aba1c86 100644 --- a/src/common/srchcmn.cpp +++ b/src/common/srchcmn.cpp @@ -33,7 +33,7 @@ // ---------------------------------------------------------------------------- -const wxChar wxSearchCtrlNameStr[] = wxT("searchCtrl"); +const char wxSearchCtrlNameStr[] = "searchCtrl"; DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN) DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN) diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index c4bd8118b1..c050be5d9f 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -93,7 +93,7 @@ #include "dos.h" #endif -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; // If compiled under Windows, this macro can cause problems #ifdef GetFirstChild diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index e7b809eb60..50ea1ad378 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -42,8 +42,8 @@ #include "wx/statline.h" #endif -const wxChar wxGetTextFromUserPromptStr[] = wxT("Input Text"); -const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password"); +const char wxGetTextFromUserPromptStr[] = "Input Text"; +const char wxGetPasswordFromUserPromptStr[] = "Enter Password"; // ---------------------------------------------------------------------------- // constants -- 2.45.2