make various control names constants of type char, not wxChar, as this is more compat...

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 84a94863da1d92ddaeaff8f9c71ba04665b36c9d..990f3f3842f60511a699fb10a01e0d82a2516777 100644 (file)
--- 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 0959a68e3769c6fdb31fed4466284ea925acf42c..bf32419366c35d8969677f2dcfce0a51af393885 100644 (file)
--- 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 0fa2516ca319152340b5ab1a2b63a904ca6f98a4..47ba77a0e22ad38d81a1aef428f6d7b18ded107b 100644 (file)
--- 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 164aac07a57849ca7f796389ea5d16a0861926e8..69cab9702eaaefe0fffac2dc91a73d5eed1b1096 100644 (file)
--- 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 151693bc070d7a7764e4e15ba7871320a41b777e..efd635bee3548376eb716db6da8417abb262ffdf 100644 (file)
--- 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 bc33a141c7b18fe866886872f936ca943da82994..ac02a10a32e8d4dedc24884d8fed6b0c491db74b 100644 (file)
--- 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 7a70a4c1563ca54588f410fc2808df16199c18ce..fcc3b923f82b7de17cabec7e0adac04aa1cb9245 100644 (file)
--- 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 fe52966b049a67d4fb2db5596875526fe10a80fb..271c0c32bef77506d6ea914880b21d651647fb15 100644 (file)
--- 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 04edeebdc8ad558057966db974af7b7bdc6aaf09..46dfd1bda2cffa17561a68ef3be87419382bdc51 100644 (file)
--- 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 86415900cf1f356fc77810f5902ebe03b60366c0..afe838b461d627fd4761d1da80a2a56ddf931d43 100644 (file)
--- 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 a71f69f9eac948072339507660a9219cee6ced45..8060a3f8dda80187c617d1390eef239f969b4f20 100644 (file)
--- 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 14da2fffc29f1321ea49655b0fdd2a04760d8eeb..51b4a21766e603b5e40f9648a85f92965d134e61 100644 (file)
--- 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 7294b98ff6f1912335587d93892bfdeb688b74ee..3c2c3888d8dae3852c44ba7d53da439829e4abec 100644 (file)
--- 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 61dd3fa1f6884389684014c88c3fe85f68be55c3..2156e05a8788d9945ca7e64865adc7d9a28002d1 100644 (file)
--- 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 e25aaa433697c9c190b9296ccb69cf9d70853275..6817f386494b72f1b342dd43432c86f718f00f7f 100644 (file)
--- 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 8ed30e4e3253da77ab24ae3ec4a52f1791cf0768..fc7bb1088209efbfd58dd4edaf43721c0ba3f997 100644 (file)
--- 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 71884b63ce994cba86517096c85cee1b1bc57613..96dd920354a6fe4a5431b1f9b17f2286c0a860c4 100644 (file)
--- 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 3bf08570bab1f7f3b2bae0f82f6b3cddf181d17f..c2696f35ec7a2f7ebb58d14f5994fa89286e250d 100644 (file)
--- 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 39c2ee2ff2dd59e5047f13a3ebc7713d3966bd5a..d43fc4130c5fcfb6c44eee3b782e4dfb5186e6e0 100644 (file)
--- 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 b41701eaa50dfdb06cee2bdfb7a5b6a68c6c7cd8..b5d55538143d3b806bfdcfac9bb8df91299c03f9 100644 (file)
--- 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 a0f8fbcf3b92c025b97abf133e289b8a397d634f..55e290eaaed0cfeafdb59a8b5733c591f8343f72 100644 (file)
--- 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 8d7e7a33fc1373032094e18a540b99a0264b1653..7b73b3b52d7ffeb5e4325a9750ca28ad06b12532 100644 (file)
--- 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 c38c4debe00762d1d4c2d28435af665214cc2b5b..9192a5987b0bef0c465e1b2ac0ff3a544a9a4a72 100644 (file)
--- 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 3b205fde283a24a47a2d0c292e2b68212d34c201..4c1f5f59b8808f17e9284251d8f8526fc7db3903 100644 (file)
--- 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 f3d0169639b0e40280b0e4926657e122c582c781..a9b753f0938af46c950d666968c84898c0fb8a79 100644 (file)
--- 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 13b7b24c5548a4db71c6e6f6bded36128bd620bc..56c7709c884a06b0df8632d36bb20a9d47f034bd 100644 (file)
--- 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 7a1cff23d10c1ae0abbe71484de2f9d95bbfab66..fb78c8c440323c5fa57dbe2c2bcef9c8bf3fe1f9 100644 (file)
--- 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 42b516e2bf359e6ff22bb1132f71afe747b71c9b..680e6690c4675303576d5a26c4f45757725047e1 100644 (file)
--- 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 abcf72f1cde9dbd13afc2cb6c85d560674009d88..94ff72e894dcf95a1bf493c7b63d4a49056b64e8 100644 (file)
--- 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 9e77ce425bc5c0d4f701e8adf7976dcb963e9640..c850670efac591fefd99af8869b8dfd018f8160b 100644 (file)
--- 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 01604e47f6566b43812efacec650362d8cd5148b..cab8df6d63547a3343e12b637bf7db9c830722d4 100644 (file)
--- 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 f8385b6ab58216768232a3b64d74b521912167ca..db57cf04df6738655ad7a938010135c51c34d95c 100644 (file)
--- 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 2efa9a4527981832def29ad8e402aa7045271b67..60493ecb7ca003a91f51f75d8694306cb701a206 100644 (file)
--- 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 e153f291dbb07d1b71d2a76a7a8b0f36d2772438..b228a6b4777599446f262f42b37a7d5fbe3db3b7 100644 (file)
--- 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 d5952426202c1d7a7c8c64c9a8cc0253b9f7efbb..26919abfd7ab1fbb5bc144ec823dacdec9148983 100644 (file)
--- 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 8366985ec7e09447839b269b7e3d08afc9a3c2a0..93cede426a321f60fac4e70834b14a37ac2990ed 100644 (file)
--- 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 7086e812dd29735cacb186f1aadbffd44dba4e41..ba494939a7b641de6aa4f3c0dd0cfdf561c674b1 100644 (file)
--- 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 29b57c4b5b5829118fcc4b3946d317b58b6af38d..5047f96afc1da3f33c6ddcf6fc06bcb0aa84466f 100644 (file)
--- 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 9c3ef03c933d823361d69f71e1826d69dfd2600b..02650d58ed7da9cfe0a277da1c8f614e99a81827 100644 (file)
--- 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 f94e51622737c6e7cced934fb2ae1e115579a552..5a806798a445623a78b63dbea57fc98ff8e63677 100644 (file)
--- 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 02344bb77137ec57daa82271cd44597cc0046baa..4c537db35594f821b0cc663e6ec6d954378d4c36 100644 (file)
--- 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 b7a696d7ebc5662eb8372debf1b263202e80a088..e8c6cf0d8ea9e23d854aa8e699018f52dbc9ed7e 100644 (file)
--- 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 a91b8c5ebd8af2c0b6c05f9d9e9a35e09a3405b1..751717d3d16b700132fa727043a523f9fa996d97 100644 (file)
--- 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 2df27e03f7202d17836556cc13ea7687f9388a3f..831655702eb6b805d55bb654e9d5e9dc37fffb95 100644 (file)
--- 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 be108b18f979220faa88c32094859f124e29aeb9..fc46906736c6c874d2bf86d283b219d0933f6d1e 100644 (file)
--- 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 3d775be237bdf9a839679c8653283fc08935f0ad..99167e7474ae242f5d358deb1a3703f5464bbd74 100644 (file)
--- 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 386e849872272552ba64c70a9a2f365109c947e1..2fd11701803eb34ac541bbe2c6ffea8a0338d559 100644 (file)
--- 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 73f773c9f81d48bb0a93971e8c180cf613b79a56..24281700b402d7996afc8377ca80428b7fdbff6f 100644 (file)
--- 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 efeeee65b21f8f6ff4631148ef43ccc3ad4731c8..039df42af356b4a0dc597941cb6bb5a40c4316f5 100644 (file)
--- 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 6b43415c84115c71b4bc7578f5d9b1d643d12659..b1046d6d5e72017957c60d1655c51eeafdbacced 100644 (file)
--- 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 3a1c6cb047d510400644915ca51e01b75fcccb9e..05059831bb41531cc24ef37e8fcdbae8f87f3de7 100644 (file)
--- 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 47ccd84a01c00e1a7bab91556bd5d3a4cdb2a2aa..34928b79f6172b1311c3039591747178c362d4f6 100644 (file)
--- 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 75ad314bc1bf9875078962019df507b96a1f7010..97a7fe83f585ebb1d0b9b1efef9d2ee98226887d 100644 (file)
--- 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 1a20a0465885de66cc67d141837fa195c7f49ea3..e770e8fee2ec58c9b1c023504228d23bc0f8062d 100644 (file)
--- 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 c70691455852880bc956a29f57a678c4faacca96..991a856fad17d534f758c5e2593750fbe4dae034 100644 (file)
--- 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 02efd9193a63949d31fc616e3ec8ba0590d2c3aa..1579a3744e66a6b4227494176126e49dc51010a3 100644 (file)
--- 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 9b03805b5203775029c7633db749e67c9adc1f6f..35d3667e0e21b718febab2c654b5efdd13187495 100644 (file)
--- 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 db5fea5e20adcd11e8c5a4c1a3ce2876297d4aab..6685fda3cf9e13e653e918a904832e1f22dcc37f 100644 (file)
--- 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 7349262a5361905b7002d7c77c0d5664fec9d238..5cbd6a7058ad6def1e9cbb6061939516d08c0e69 100644 (file)
--- 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 1a026c4e394453fc0d477fa4a80ea719154005cf..3e4fbb119f3a8c2681661ace87cb1df0d859cfa0 100644 (file)
--- 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 fdc0a9a7408034b567463d841d9f321b921934e2..10baf573200099561343d4b00c768e8c91435a23 100644 (file)
--- 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 97e1913b3471866df137f5502d187f60a53d60be..bec014f6b4c8b09d3c58eb568fcc27fe61877ec4 100644 (file)
--- 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 3ca7872f1d1c12e7af39e98f183264b9cde8d024..cc1dd50bbe9e4d276ec1712cb4f141c3f5f25432 100644 (file)
--- 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 a41d08ef3ee5ff99db7f79234d43237f7e1a0577..5bfe90f182ca0552ab2a01520e774f8e80d71372 100644 (file)
--- 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 41f5f553cbbae7fe53d491b84111232640f0db81..22b5661be6b7becb379b5eb01ee76d64358dc39e 100644 (file)
--- 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 8cdbaf7e0a6ac7f5116cad5875e70b967fe8482f..3f5aba1c86640e7e43de7ad3a3afa7fc17d922d7 100644 (file)
--- 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 c4bd8118b1d2953c826d22228afd6b18851c316b..c050be5d9fd860371dfe3949f1d4564ac8da5131 100644 (file)
--- 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 e7b809eb60ea504dcbdde8adf828965e3b57f53c..50ea1ad378c70b41754b185d04ca26b129f08b04 100644 (file)
--- 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