diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 775d90bb5d..3db49e1b44 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 wxChar) 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 8277c66ebc..b1a05acf0c 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -47,7 +47,7 @@
 
 class WXDLLEXPORT wxBitmap;
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 9f9b5e83d9..5d574e9e5b 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 wxChar) 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 a594dba58e..feb94c7ffd 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 wxChar) wxChoiceNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings
diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h
index a9e793a22d..d5b13e7cc6 100644
--- a/include/wx/cocoa/dialog.h
+++ b/include/wx/cocoa/dialog.h
@@ -17,7 +17,7 @@
 #include "wx/panel.h"
 #include "wx/cocoa/NSPanel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
 // ========================================================================
 // wxDialog
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 051737b646..2a7ffa1fab 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 wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
diff --git a/include/wx/control.h b/include/wx/control.h
index cc394434e3..ce8aabe406 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 wxChar) wxControlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 6e31a8d8d1..863f032620 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -24,7 +24,7 @@
 #include "wx/textctrl.h"
 #include "wx/bitmap.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxDataViewCtrlNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[];
 
 
 
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 204f38ba65..e56f985490 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -27,7 +27,7 @@ class WXDLLEXPORT wxStdDialogButtonSizer;
 #define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
 #endif
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 0752c5e972..fd84e5ae19 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -20,9 +20,10 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+
 
 #ifdef __WXWINCE__
     #define wxDD_DEFAULT_STYLE \
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index e1a6d767ad..7e1a92bfb6 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -36,8 +36,8 @@ enum
     wxCHANGE_DIR        = 0x0040
 };
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorPromptStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorDefaultWildcardStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
diff --git a/include/wx/frame.h b/include/wx/frame.h
index 8d5ce34cc9..6801dffc15 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -19,9 +19,9 @@
 #include "wx/toplevel.h"      // the base class
 
 // the default names for various classs
-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxMenuBar;
diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 0eb6adee67..9c81e0223e 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -32,7 +32,7 @@
 #define wxGA_PROGRESSBAR     0
 
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 6033cdf7cd..d38fe44b93 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -590,7 +590,7 @@ extern WXDLLEXPORT_DATA(wxCursor*)    wxCROSS_CURSOR;
 
 extern WXDLLEXPORT_DATA(wxColourDatabase*)  wxTheColourDatabase;
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index a71b15bf78..276f1299e1 100644
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -20,8 +20,8 @@ class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT 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 wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 #ifndef wxDD_DEFAULT_STYLE
 
 #ifdef __WXWINCE__
diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 6c34b811ca..eb253e08ef 100644
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -20,8 +20,8 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index a731dcdc5b..85220f9e10 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -18,7 +18,7 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxGenericMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index c43ab9848e..1cb6a708ec 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -21,7 +21,7 @@
 
 class WXDLLEXPORT wxControlContainer;
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxPanel contains other controls and implements TAB traversal between them
diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index e7ac4d7409..06c8ec4791 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -17,7 +17,7 @@
 #include "wx/statusbr.h"
 #include "wx/arrstr.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index b8f4eb474a..88a65fbd9b 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -24,8 +24,8 @@
 
 class WXDLLEXPORT wxTextCtrl;
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxGetTextFromUserPromptStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxGetPasswordFromUserPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 
diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 0241706faf..95c74f0da3 100644
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxButton
diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 5f33b99a53..4f551834ed 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 2ae0638682..46e0074dfd 100644
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxDialog
diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 44f6ba4334..6b967c3bc8 100644
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index cbfb62263f..38f7b63d6c 100644
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -30,8 +30,8 @@ class WXDLLIMPEXP_CORE wxMDIChildFrame;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr;
-extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index 1b40095454..596deaad08 100644
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -18,7 +18,7 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 98e28f1210..50d981942a 100644
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxToggleBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 0241706faf..95c74f0da3 100644
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxButton
diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 5f33b99a53..4f551834ed 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 2ae0638682..46e0074dfd 100644
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxDialog
diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 44f6ba4334..6b967c3bc8 100644
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index cbfb62263f..38f7b63d6c 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -30,8 +30,8 @@ class WXDLLIMPEXP_CORE wxMDIChildFrame;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr;
-extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index 1b40095454..596deaad08 100644
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -18,7 +18,7 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index 98e28f1210..50d981942a 100644
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxToggleBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 18d6e58431..b415951c7b 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
 // global data
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index ba631c7985..4eae666734 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 wxChar) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h
index 1c9052bc3b..c5f9e64e26 100644
--- a/include/wx/mac/carbon/bmpbuttn.h
+++ b/include/wx/mac/carbon/bmpbuttn.h
@@ -14,7 +14,7 @@
 
 #include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h
index 89e84466e7..c4abaea100 100644
--- a/include/wx/mac/carbon/button.h
+++ b/include/wx/mac/carbon/button.h
@@ -15,7 +15,7 @@
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index 901702ed00..56de8da3e4 100644
--- a/include/wx/mac/carbon/choice.h
+++ b/include/wx/mac/carbon/choice.h
@@ -17,7 +17,7 @@
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 4e2520991c..0b05bb9697 100644
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -14,7 +14,7 @@
 
 #include "wx/choice.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
 
 // forward declaration of private implementation classes
 
diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h
index 3cfd1bf3f5..29001f0667 100644
--- a/include/wx/mac/carbon/control.h
+++ b/include/wx/mac/carbon/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxControlNameStr[];
 
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index c1e0c03e45..2cd80c2b75 100644
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxMacToolTip ;
 
diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index 104a622b0f..14314745e8 100644
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -17,8 +17,8 @@
 #include "wx/accel.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
diff --git a/include/wx/mac/carbon/gauge.h b/include/wx/mac/carbon/gauge.h
index 727906ba1e..97109b1459 100644
--- a/include/wx/mac/carbon/gauge.h
+++ b/include/wx/mac/carbon/gauge.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge: public wxGaugeBase
diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index 99d13a80b6..8590685faa 100644
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -16,8 +16,8 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
diff --git a/include/wx/mac/carbon/msgdlg.h b/include/wx/mac/carbon/msgdlg.h
index a71fe4efb1..cdeb7fd085 100644
--- a/include/wx/mac/carbon/msgdlg.h
+++ b/include/wx/mac/carbon/msgdlg.h
@@ -20,7 +20,7 @@
  * Message box dialog
  */
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/mac/carbon/radiobut.h b/include/wx/mac/carbon/radiobut.h
index 0c8569b2af..8b3c063f95 100644
--- a/include/wx/mac/carbon/radiobut.h
+++ b/include/wx/mac/carbon/radiobut.h
@@ -56,7 +56,7 @@ public:
 #if 0
 class WXDLLEXPORT wxBitmap ;
 
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
 
 class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 {
diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h
index 0c56d1963d..71c711e305 100644
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index 470b61cc27..76d5687af8 100644
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -16,7 +16,7 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase
diff --git a/include/wx/mac/carbon/statbox.h b/include/wx/mac/carbon/statbox.h
index 54154b050a..11fee4c9b4 100644
--- a/include/wx/mac/carbon/statbox.h
+++ b/include/wx/mac/carbon/statbox.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
 
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index a5480b2ffa..59d42e72b7 100644
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -22,7 +22,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
 
 class wxMacTextControl ;
 
diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h
index 4524315dba..7031d4a6a9 100644
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 07169cec2c..a5fb9c3b85 100644
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -17,7 +17,7 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
diff --git a/include/wx/mac/classic/bmpbuttn.h b/include/wx/mac/classic/bmpbuttn.h
index 66472d9c92..4852167f3d 100644
--- a/include/wx/mac/classic/bmpbuttn.h
+++ b/include/wx/mac/classic/bmpbuttn.h
@@ -14,7 +14,7 @@
 
 #include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
diff --git a/include/wx/mac/classic/button.h b/include/wx/mac/classic/button.h
index 9e21086a73..9b6eea1a4c 100644
--- a/include/wx/mac/classic/button.h
+++ b/include/wx/mac/classic/button.h
@@ -15,7 +15,7 @@
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
diff --git a/include/wx/mac/classic/choice.h b/include/wx/mac/classic/choice.h
index c5c0dde2f5..d3af0db711 100644
--- a/include/wx/mac/classic/choice.h
+++ b/include/wx/mac/classic/choice.h
@@ -17,7 +17,7 @@
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
diff --git a/include/wx/mac/classic/combobox.h b/include/wx/mac/classic/combobox.h
index d207bbdb94..6fc7a51efb 100644
--- a/include/wx/mac/classic/combobox.h
+++ b/include/wx/mac/classic/combobox.h
@@ -14,7 +14,7 @@
 
 #include "wx/choice.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
 
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
diff --git a/include/wx/mac/classic/control.h b/include/wx/mac/classic/control.h
index a4467b32a1..7203f872b6 100644
--- a/include/wx/mac/classic/control.h
+++ b/include/wx/mac/classic/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxControlNameStr[];
 
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
diff --git a/include/wx/mac/classic/dialog.h b/include/wx/mac/classic/dialog.h
index c1e0c03e45..813321910a 100644
--- a/include/wx/mac/classic/dialog.h
+++ b/include/wx/mac/classic/dialog.h
@@ -14,9 +14,9 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
-class WXDLLEXPORT wxMacToolTip ;
+class WXDLLEXPORT wxMacToolTip;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
diff --git a/include/wx/mac/classic/frame.h b/include/wx/mac/classic/frame.h
index e101d20a46..7bec2db6d2 100644
--- a/include/wx/mac/classic/frame.h
+++ b/include/wx/mac/classic/frame.h
@@ -17,8 +17,8 @@
 #include "wx/accel.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
diff --git a/include/wx/mac/classic/gauge.h b/include/wx/mac/classic/gauge.h
index 5b453b1491..926226de32 100644
--- a/include/wx/mac/classic/gauge.h
+++ b/include/wx/mac/classic/gauge.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge: public wxGaugeBase
diff --git a/include/wx/mac/classic/mdi.h b/include/wx/mac/classic/mdi.h
index 14ca43270f..ec09332a38 100644
--- a/include/wx/mac/classic/mdi.h
+++ b/include/wx/mac/classic/mdi.h
@@ -16,8 +16,8 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
diff --git a/include/wx/mac/classic/msgdlg.h b/include/wx/mac/classic/msgdlg.h
index 18552e6210..c49e755729 100644
--- a/include/wx/mac/classic/msgdlg.h
+++ b/include/wx/mac/classic/msgdlg.h
@@ -20,7 +20,7 @@
  * Message box dialog
  */
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/mac/classic/radiobut.h b/include/wx/mac/classic/radiobut.h
index f1b94f2997..3b11a817fa 100644
--- a/include/wx/mac/classic/radiobut.h
+++ b/include/wx/mac/classic/radiobut.h
@@ -54,7 +54,7 @@ public:
 #if 0
 class WXDLLEXPORT wxBitmap ;
 
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
 
 class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 {
diff --git a/include/wx/mac/classic/scrolbar.h b/include/wx/mac/classic/scrolbar.h
index 7db69e4cbc..1e49e090bf 100644
--- a/include/wx/mac/classic/scrolbar.h
+++ b/include/wx/mac/classic/scrolbar.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
diff --git a/include/wx/mac/classic/slider.h b/include/wx/mac/classic/slider.h
index 7434b05dc3..e79d35eb63 100644
--- a/include/wx/mac/classic/slider.h
+++ b/include/wx/mac/classic/slider.h
@@ -16,7 +16,7 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxControl
diff --git a/include/wx/mac/classic/statbox.h b/include/wx/mac/classic/statbox.h
index f32c7255cb..c137bbd18a 100644
--- a/include/wx/mac/classic/statbox.h
+++ b/include/wx/mac/classic/statbox.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
 
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
diff --git a/include/wx/mac/classic/textctrl.h b/include/wx/mac/classic/textctrl.h
index 7f0d774304..29fb31fe7b 100644
--- a/include/wx/mac/classic/textctrl.h
+++ b/include/wx/mac/classic/textctrl.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
diff --git a/include/wx/mac/classic/tglbtn.h b/include/wx/mac/classic/tglbtn.h
index edae7f0aa3..c287d822fa 100644
--- a/include/wx/mac/classic/tglbtn.h
+++ b/include/wx/mac/classic/tglbtn.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
diff --git a/include/wx/mac/classic/toolbar.h b/include/wx/mac/classic/toolbar.h
index b94f2c7f25..18141faa1a 100644
--- a/include/wx/mac/classic/toolbar.h
+++ b/include/wx/mac/classic/toolbar.h
@@ -17,7 +17,7 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index f0be368a9c..12e013922c 100644
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -20,7 +20,7 @@
 // Message box dialog
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 91dd0fc564..13c8c2b59a 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 wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
 class WXDLLEXPORT wxToolBar;
-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 #endif
 
 // Dialog boxes
diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 39a86a3787..79ae164e66 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 wxChar) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxGaugeBase
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 393522250e..9f31e4543e 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -14,8 +14,8 @@
 
 #include "wx/frame.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index ce1f8023b4..c3cc3dd05e 100644
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -19,7 +19,7 @@
  * Message box dialog
  */
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index d580d8a731..957f9966b2 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 wxChar) 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 ea7afd2fd3..bfab81c112 100644
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/tabctrl.h
@@ -14,7 +14,7 @@
 
 class WXDLLIMPEXP_CORE wxImageList;
 
-// extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+// extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 
 /*
  * Flags returned by HitTest
diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 288eee9e74..ab99738f93 100644
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -16,7 +16,7 @@
 
 #include "wx/tbarbase.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxButtonBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonBarNameStr[];
 
 class WXDLLEXPORT wxMemoryDC;
 
diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index b591743bde..fd59de8e23 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 wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 7f6b719f63..eab5947b79 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -37,7 +37,7 @@ enum
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxNotebookNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
 
 #if WXWIN_COMPATIBILITY_2_4
     #define wxNOTEBOOK_NAME wxNotebookNameStr
diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index a7fc389813..905d372a22 100644
--- 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 wxChar) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 0706163a56..0c4001e1a3 100644
--- 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 wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxDialogModalData;
 
diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h
index 677dd03e76..08a393ff91 100644
--- a/include/wx/os2/dirdlg.h
+++ b/include/wx/os2/dirdlg.h
@@ -14,7 +14,7 @@
 
 #include "wx/dialog.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[];
 
 class WXDLLEXPORT wxDirDialog: public wxDialog
 {
diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index a4e579fdf9..6a59683072 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -93,42 +93,42 @@ class WXDLLEXPORT wxBitmap;
 //
 // Controls
 //
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasNameStr;
-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*) wxStaticTextNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxMultiTextNameStr;
-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*) wxStaticNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlWindowNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxVirtListBoxNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEnhDialogNameStr;
-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 wxChar) wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxCanvasNameStr[];
+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) wxStaticTextNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxMultiTextNameStr[];
+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) wxStaticNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlWindowNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxVirtListBoxNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonBarNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxEnhDialogNameStr[];
+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 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 wxChar) wxTreeCtrlNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogDefaultFolderStr[];
 
 //
 // Class names
diff --git a/include/wx/os2/tglbtn.h b/include/wx/os2/tglbtn.h
index bd2657bc31..02344bb771 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 wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
diff --git a/include/wx/palmos/dialog.h b/include/wx/palmos/dialog.h
index 58428be7a8..8ae6255e1f 100644
--- a/include/wx/palmos/dialog.h
+++ b/include/wx/palmos/dialog.h
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxDialogModalData;
 
diff --git a/include/wx/palmos/gauge.h b/include/wx/palmos/gauge.h
index 1d5699f3c7..b3de89d800 100644
--- a/include/wx/palmos/gauge.h
+++ b/include/wx/palmos/gauge.h
@@ -14,7 +14,7 @@
 
 #if wxUSE_GAUGE
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge : public wxGaugeBase
diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h
index 55f5356b5d..401feb3d01 100644
--- a/include/wx/palmos/mdi.h
+++ b/include/wx/palmos/mdi.h
@@ -14,8 +14,8 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
diff --git a/include/wx/palmos/msgdlg.h b/include/wx/palmos/msgdlg.h
index c48fd86a22..e191ad69bc 100644
--- a/include/wx/palmos/msgdlg.h
+++ b/include/wx/palmos/msgdlg.h
@@ -19,7 +19,7 @@
  * Message box dialog
  */
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
diff --git a/include/wx/palmos/statbmp.h b/include/wx/palmos/statbmp.h
index 2ae179f41b..4372ce743b 100644
--- a/include/wx/palmos/statbmp.h
+++ b/include/wx/palmos/statbmp.h
@@ -16,7 +16,7 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
diff --git a/include/wx/palmos/tabctrl.h b/include/wx/palmos/tabctrl.h
index eded1fa2d1..cb1a3dc4f5 100644
--- a/include/wx/palmos/tabctrl.h
+++ b/include/wx/palmos/tabctrl.h
@@ -14,7 +14,7 @@
 
 class wxImageList;
 
-// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+// WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 /*
  * Flags returned by HitTest
diff --git a/include/wx/palmos/tglbtn.h b/include/wx/palmos/tglbtn.h
index 1fd907bc17..820768cca0 100644
--- a/include/wx/palmos/tglbtn.h
+++ b/include/wx/palmos/tglbtn.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 01c8514cdf..125075214a 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -16,7 +16,7 @@
 
 #include "wx/ctrlsub.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) 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 92d0e75173..26e02b85a3 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 wxChar) wxRadioButtonNameStr[];
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/radiobut.h"
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index e19f3de923..2c39fb2559 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 wxChar) wxScrollBarNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
diff --git a/include/wx/slider.h b/include/wx/slider.h
index a58b942be4..12e488c099 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -44,7 +44,7 @@
 #define wxSL_NOTIFY_DRAG     0x0000
 
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 80b4d2dcf8..bdd278fd07 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 wxChar) 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 aea08aca5e..29ab7c42e0 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 wxChar) wxStaticBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
diff --git a/include/wx/statline.h b/include/wx/statline.h
index 18d48a7f68..f204805800 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*) wxStaticTextNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 97f7f54414..4ac8badb07 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
 
 class WXDLLEXPORT wxStaticTextBase : public wxControl
 {
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 44f022092b..2414b2c56b 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -32,7 +32,7 @@ class WXDLLEXPORT wxImage;
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) 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 df9b73ce78..48e9ae640f 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -62,7 +62,7 @@ typedef long wxTextCoord;
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxTextCtrlNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) 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 88e4b987c4..7aeecdc65a 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -21,8 +21,8 @@
 #include "wx/window.h"
 #include "wx/iconbndl.h"
 
-// the default names for various classs
-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
+// the default names for various classes
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
 
 class WXDLLEXPORT wxTopLevelWindowBase;
 
diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index bd9ae42ff0..445b4c28bc 100644
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -216,7 +216,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 wxChar) 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 26872c44f5..8a00658066 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 wxChar) wxDialogNameStr[];
 class WXDLLEXPORT wxWindowDisabler;
 class WXDLLEXPORT wxEventLoop;
 
diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 6c306155e4..1b75320de4 100644
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -108,55 +108,55 @@ wxFont    wxNullFont;
 wxColour  wxNullColour;
 
 // Default window names
-WXDLLEXPORT_DATA(const wxChar *) wxControlNameStr = wxT("control");
-WXDLLEXPORT_DATA(const wxChar *) wxButtonNameStr = wxT("button");
-WXDLLEXPORT_DATA(const wxChar *) wxButtonBarNameStr = wxT("buttonbar");
-WXDLLEXPORT_DATA(const wxChar *) wxCanvasNameStr = wxT("canvas");
-WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr = wxT("check");
-WXDLLEXPORT_DATA(const wxChar *) wxChoiceNameStr = wxT("choice");
-WXDLLEXPORT_DATA(const wxChar *) wxComboBoxNameStr = wxT("comboBox");
-WXDLLEXPORT_DATA(const wxChar *) wxDialogNameStr = wxT("dialog");
-WXDLLEXPORT_DATA(const wxChar *) wxFrameNameStr = wxT("frame");
-WXDLLEXPORT_DATA(const wxChar *) wxGaugeNameStr = wxT("gauge");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticBoxNameStr = wxT("groupBox");
-WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox");
-WXDLLEXPORT_DATA(const wxChar *) wxListCtrlNameStr = wxT("listCtrl");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("staticText");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("staticBitmap");
-WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext");
-WXDLLEXPORT_DATA(const wxChar *) wxNotebookNameStr = wxT("notebook");
-WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel");
-WXDLLEXPORT_DATA(const wxChar *) wxRadioBoxNameStr = wxT("radioBox");
-WXDLLEXPORT_DATA(const wxChar *) wxRadioButtonNameStr = wxT("radioButton");
-WXDLLEXPORT_DATA(const wxChar *) wxBitmapRadioButtonNameStr = wxT("radioButton");
-WXDLLEXPORT_DATA(const wxChar *) wxScrollBarNameStr = wxT("scrollBar");
-WXDLLEXPORT_DATA(const wxChar *) wxSliderNameStr = wxT("slider");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticNameStr = wxT("static");
-WXDLLEXPORT_DATA(const wxChar *) wxStatusLineNameStr = wxT("status_line");
-WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlWindowNameStr = wxT("textWindow");
-WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlNameStr = wxT("text");
-WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl");
-WXDLLEXPORT_DATA(const wxChar *) wxEnhDialogNameStr = wxT("Shell");
-WXDLLEXPORT_DATA(const wxChar *) wxToolBarNameStr = wxT("toolbar");
-WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox");
-WXDLLEXPORT_DATA(const wxChar *) wxDataViewCtrlNameStr = wxT("dataviewCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[] = wxT("control");
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonBarNameStr[] = wxT("buttonbar");
+extern WXDLLEXPORT_DATA(const wxChar) wxCanvasNameStr[] = wxT("canvas");
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");
+extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[] = wxT("choice");
+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) wxGaugeNameStr[] = wxT("gauge");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[] = wxT("listCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap");
+extern WXDLLEXPORT_DATA(const wxChar) wxMultiTextNameStr[] = wxT("multitext");
+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) wxStaticNameStr[] = wxT("static");
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line");
+extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlWindowNameStr[] = wxT("textWindow");
+extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
+extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxEnhDialogNameStr[] = wxT("Shell");
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
+extern WXDLLEXPORT_DATA(const wxChar) wxVirtListBoxNameStr[] = wxT("virtListBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 // Default messages
-WXDLLEXPORT_DATA(const wxChar *) wxGetTextFromUserPromptStr = wxT("Input Text");
-WXDLLEXPORT_DATA(const wxChar *) wxGetPasswordFromUserPromptStr = wxT("Enter Password");
-WXDLLEXPORT_DATA(const wxChar *) wxMessageBoxCaptionStr = wxT("Message");
-WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file");
+extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[] = wxT("Input Text");
+extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
+extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file");
 
 // Other default strings
-WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] =
 #if defined(__WXMSW__) || defined(__OS2__)
     wxT("*.*")
 #else // Unix/Mac
     wxT("*")
 #endif
     ;
-WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
-WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/");
 
 #if defined(__WXMSW__) || defined(__OS2__)
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
diff --git a/src/common/dseldlg.cpp b/src/common/dseldlg.cpp
index ecf4fc9217..4f4144bd0a 100644
--- a/src/common/dseldlg.cpp
+++ b/src/common/dseldlg.cpp
@@ -35,7 +35,7 @@
 // implementation
 // ============================================================================
 
-const wxChar *wxDirSelectorPromptStr = wxT("Select a directory");
+const wxChar wxDirSelectorPromptStr[] = wxT("Select a directory");
 
 wxString wxDirSelector(const wxString& message,
                        const wxString& defaultPath,