Move constant strings to .rodata/.data.rel.ro ELF segment from .data by making them...

If any more exotic toolchain decides to not export these strings into the core library anymore, let me know. Try to
compile the notebook sample, for example.
TODO: Move strings not meant for wxCore out of wxCore to the appropriate library.

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 775d90bb5d4383c097c05aa1e0c557e9ccc3493d..3db49e1b44d97baf02461b2be159b57556288672 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 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 8277c66ebc84227facf470e0b28f0af42e57cffd..b1a05acf0cdefbda9c3623004c3d6107851b11e6 100644 (file)
--- 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 9f9b5e83d9c072b1b7369923bf0200dabc60e7c0..5d574e9e5bc3dca6e53f9cab826a5b93eff3c354 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 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 a594dba58e15868eb60ae1036d4eda29d5958480..feb94c7ffd1519856dae125ca39c13bc495789eb 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 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 a9e793a22d9ead8cea67bcbfc6cb500bad5aca23..d5b13e7cc638d027a1d7f2bcf08fbc081a2c3d1c 100644 (file)
--- 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 051737b64677c4a63b7e33df13cd4c9943bd3aee..2a7ffa1faba8df4c1c76fefca0fe04dd94f043bf 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 wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement

diff --git a/include/wx/control.h b/include/wx/control.h
index cc394434e3018ad5edfe5dd6b10eaa0f7a36414e..ce8aabe406014541454d3240db34e608164e61b4 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 wxChar) wxControlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 6e31a8d8d162fc1b41ca22269edf8d8e6a1c97f9..863f032620248feacd0469274957d9e12aaeee47 100644 (file)
--- 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 204f38ba6599438aca1a912791ad4c28c106e10e..e56f985490bb188eef2d2110cab1856b244aa5f4 100644 (file)
--- 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 0752c5e97224c0061bc47fe7f908f075f234ed4a..fd84e5ae19a492c90ec39fb2de75e0b212eed89c 100644 (file)
--- 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 e1a6d767ad20354534b040183092a7e1540a941c..7e1a92bfb61e20dd97f7583eeef83201783a0bca 100644 (file)
--- 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 8d5ce34cc9ccd35dadfb6f983ecf1fe55193179d..6801dffc152b81fabcf06763d44d2d47c252048e 100644 (file)
--- 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 0eb6adee67986a5fed4465c103edd42a58f5874f..9c81e0223e6ce6e2dfe6c4e96b6a6a123bb5a106 100644 (file)
--- 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 6033cdf7cda638463f41b03913318b650ec01a2f..d38fe44b934dbe048d3d3ae411d2cf58c2448482 100644 (file)
--- 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 a71b15bf78af4d080b2f9493c35bcd1cbd0ff24e..276f1299e1707c5df750e06520223556a9baa7c0 100644 (file)
--- 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 6c34b811ca1935ad9a1b5ea5678c825883d8e1f3..eb253e08ef28979ad7d68f1a2060561bf84736e1 100644 (file)
--- 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 a731dcdc5b46c2b4bb85a8e8001370b5702f6c12..85220f9e10f136f7d62e051e9c6f2441bda6181e 100644 (file)
--- 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 c43ab9848e7d481c328bc3b6a5829d80e8ca50eb..1cb6a708ec9348889c7de97bfd5986776fd107e6 100644 (file)
--- 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 e7ac4d74096e1e86a9d505ae737475c2cee1f83e..06c8ec47914892006881da2fe97336e639638235 100644 (file)
--- 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 b8f4eb474a125f3ae70b7e1f49d122ad5bf6420e..88a65fbd9bd1f5568961b51a965ba071d4082f31 100644 (file)
--- 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 0241706fafe91cd2947ac4dee654d30414b1addc..95c74f0da3005e89afb9f74d22f3952ce8f881eb 100644 (file)
--- 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 5f33b99a53c334fe9caab37cbb23e019b72ec5f1..4f551834ed58ee9415b301b28cd7a4dd4a634152 100644 (file)
--- 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 2ae06386823340820b85f6e151273c21cf1587e2..46e0074dfdd469ffecc9c8dae962c9d736a2ff2d 100644 (file)
--- 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 44f6ba43342cd1866aaaf9f9caa1b205d2a14122..6b967c3bc8f844a46fd765e025e5546b9897b268 100644 (file)
--- 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 cbfb62263f552f7ad81564f216b3a60a53115c37..38f7b63d6cb5ab9db41b25d22650cd0977e49cee 100644 (file)
--- 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 1b400954546819ead6ae02ed86621ff5fb937118..596deaad0860b8658c5bcbd6f3b16489a3efcc86 100644 (file)
--- 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 98e28f1210984abc75a7fb2552510ce39e6d0422..50d981942abda254249a719f0df00c3736904321 100644 (file)
--- 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 0241706fafe91cd2947ac4dee654d30414b1addc..95c74f0da3005e89afb9f74d22f3952ce8f881eb 100644 (file)
--- 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 5f33b99a53c334fe9caab37cbb23e019b72ec5f1..4f551834ed58ee9415b301b28cd7a4dd4a634152 100644 (file)
--- 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 2ae06386823340820b85f6e151273c21cf1587e2..46e0074dfdd469ffecc9c8dae962c9d736a2ff2d 100644 (file)
--- 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 44f6ba43342cd1866aaaf9f9caa1b205d2a14122..6b967c3bc8f844a46fd765e025e5546b9897b268 100644 (file)
--- 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 cbfb62263f552f7ad81564f216b3a60a53115c37..38f7b63d6cb5ab9db41b25d22650cd0977e49cee 100644 (file)
--- 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 1b400954546819ead6ae02ed86621ff5fb937118..596deaad0860b8658c5bcbd6f3b16489a3efcc86 100644 (file)
--- 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 98e28f1210984abc75a7fb2552510ce39e6d0422..50d981942abda254249a719f0df00c3736904321 100644 (file)
--- 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 18d6e58431fe59e839c8342c8948726587ab445e..b415951c7badb47fe0385f0f0e56d58913792d40 100644 (file)
--- 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 ba631c79854d4bc1fe58e64b3d690f7174a092a8..4eae6667341c40099c8b9a0bdb3b58cb323bf7be 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 wxChar) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration

diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h
index 1c9052bc3b6bdc3d5e90d35a843dcb6ce6888e42..c5f9e64e26849f6513a900c9258e31476fc8db3f 100644 (file)
--- 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 89e84466e71b26f1e699fe4abc9f6f7e3d49abd4..c4abaea100ebf352e042ba6adb8fe4083d40d070 100644 (file)
--- 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 901702ed00d3d02fc2ec98226f8d82668daadc3d..56de8da3e4151b43336785dfb376dea62ea9077d 100644 (file)
--- 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 4e2520991c49a4a3f0dd408dae9742eaded8bafd..0b05bb96971a1661f89b818e6b609f7755139e71 100644 (file)
--- 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 3cfd1bf3f5c855e8e36e72e22ff27d50226c887b..29001f066766378814ef8b70756f3e7d94203a11 100644 (file)
--- 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 c1e0c03e45f1d39fa1584bd77767c70e68fc67a1..2cd80c2b759389ab89ce1ec9bd46aead16ff8480 100644 (file)
--- 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 104a622b0fc717625b17e7e1ce24e2e1c6be7129..14314745e841d348910ba89a645d3e6272beb774 100644 (file)
--- 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 727906ba1e53a2863076580825e08fc57f1e790e..97109b14598118b5c6a362f91877f726a65c2123 100644 (file)
--- 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 99d13a80b66a0ae9b6ba0aac2378f257fcdba9e1..8590685faa04e6612cec2cc1a854e71f71b34493 100644 (file)
--- 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 a71fe4efb1c18a91ad43c20966dc5825f464e498..cdeb7fd0852ff60dfa536c9b17127d781ab4d78a 100644 (file)
--- 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 0c8569b2afd99bb30b1134e9e353ea6e7fa6ca4c..8b3c063f9533553034aa4d1e6bda32fc9e1bd394 100644 (file)
--- 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 0c56d1963d987dabf3deb2dd081d1b1462364549..71c711e3057d4bbea1b22145bd773c8067291943 100644 (file)
--- 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 470b61cc27ff1c3e62d6f0a5a804a4701ef42e15..76d5687af84cb3250252c109dc6f10b35dc4241b 100644 (file)
--- 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 54154b050ac09aecdc85001bdc45e6298f9937a3..11fee4c9b41862bb9824cb44d11626810070f2ff 100644 (file)
--- 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 a5480b2ffa377dcf9a47b250485b6c052af01e59..59d42e72b7fb0f1f3a2e19353244ba8ca259415a 100644 (file)
--- 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 4524315dbab533f689f4650d5250f77cb832ce17..7031d4a6a9aaa800c3f7ae9e3262591bed08f4f0 100644 (file)
--- 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 07169cec2c1ded1420d1ff52b8a24d2da33b1b1f..a5fb9c3b85c50283df6e5615e346a697853bec26 100644 (file)
--- 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 66472d9c9296c001f9577e684cafba81413359b6..4852167f3d844a7894fdf056896bbfe71104fdb6 100644 (file)
--- 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 9e21086a7376b0a18cfe9acebbb6c62330ed6edd..9b6eea1a4c56882046f453f176c293ccaf4b5b25 100644 (file)
--- 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 c5c0dde2f5c9d815f22f3c18a9408703a9104fe1..d3af0db711931e08db5b3da77721040d9f436117 100644 (file)
--- 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 d207bbdb945ea69d842a091e0c457d3786042dd6..6fc7a51efbe52b7e21b1f2ba8ffec2c6a3edba7d 100644 (file)
--- 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 a4467b32a1ec9e0db2fac33dae622a5bff492623..7203f872b6413d53dfbafb516a936eda9381211d 100644 (file)
--- 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 c1e0c03e45f1d39fa1584bd77767c70e68fc67a1..813321910a7ea38c10ba2314786a8ebe0dcf7e36 100644 (file)
--- 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 e101d20a46895a4fcb6577eff7094651120fd2ba..7bec2db6d23974df0e9ef396f74dac9aa28e4679 100644 (file)
--- 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 5b453b1491f75648c78dd7b30f8ad3538582b3b8..926226de326a9a02ee3557162ade8471a8ef3a75 100644 (file)
--- 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 14ca43270fa14704af1206395d6d4a0072825491..ec09332a38407275ab30c66e4170f063d66d2f4a 100644 (file)
--- 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 18552e6210d2c3acd47938d25354cdf3eee158a1..c49e7557295130f9cd36ea8cc2b2164d2bb35e29 100644 (file)
--- 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 f1b94f299741c32c77cf94ee797a9bbf29d856d6..3b11a817faef25f424e29c12cc2d30708102b96b 100644 (file)
--- 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 7db69e4cbc3bf33b92f85bed71a4422b071c9187..1e49e090bf05ef6d6f425882c20807507a46f342 100644 (file)
--- 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 7434b05dc3ccdbc9310d552aad4de86ebabd88db..e79d35eb6395f72d6f89e426e5f6cb0714e3d939 100644 (file)
--- 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 f32c7255cb9a568c576126ca2502f8aee2e6b49b..c137bbd18a95fbfea764cceebb963338ff09f5a8 100644 (file)
--- 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 7f0d774304dfdf659830fea217bb2d15564db480..29fb31fe7be0d5c3abbc5598bbbc68942f309318 100644 (file)
--- 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 edae7f0aa3c7fdde7ff39ffebf8076c6b60e118f..c287d822fad6ede45f88799fd08a223bebd1b0ce 100644 (file)
--- 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 b94f2c7f25f713f74c86396fd6a46a78529708f8..18141faa1aba3dc7f8e905fea67073bddfc32d98 100644 (file)
--- 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 f0be368a9cae2f1b7d2496ee8d16ae75130d52a7..12e013922cf2ba52e53ba5a3eb27218a5a2fe2ac 100644 (file)
--- 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 91dd0fc5640433cf2b819478a14e9da791343109..13c8c2b59a244ee6d0883ae5a234d76b5ee77542 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 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 39a86a378728a93f883bb0b534f0cdb8d01555e3..79ae164e665b0ac09fe8cddd1fe96a0af9dbac90 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 wxChar) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxGaugeBase

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 393522250e58b4c6e983ae7470889f4e2edaef25..9f31e4543e6fb19b669e4520adbc6870d89ad5c1 100644 (file)
--- 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 ce1f8023b418ee406961f7deb80d4506e37b2892..c3cc3dd05eb82d39ab72be79c4b51013e15d97b1 100644 (file)
--- 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 d580d8a7313162cc3e746593fee32016cb461339..957f9966b22860c63ca58a119856f3c7911f3931 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 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 ea7afd2fd3b51c72973f78a2b1f4d599f9870e3d..bfab81c112f17c0a6a03ce1b2361760d93e42207 100644 (file)
--- 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 288eee9e74b75f8efcf5c0d5c8da808300e3b884..ab99738f937cb488d32ff6c703165d677fda0965 100644 (file)
--- 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 b591743bde546b4bc17aa97707bb2c99c3ae3845..fd59de8e234704ea381323b51221773bd950c92a 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 wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 7f6b719f63dea7a0db2e8469909aef12af4739db..eab5947b7948fa4460a70ebff087f824a4605bfc 100644 (file)
--- 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 a7fc389813c6787e5f48ffe111d39d53b07ef404..905d372a225d8aeb7267295491f6ade6a9214b3a 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -15,7 +15,7 @@
 #include "wx/button.h"
 #include "wx/dcclient.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 0706163a56f2650e99d8b6bbc01a7b4ad7eed935..0c4001e1a3437d95164ef99a077dedc346a39594 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxDialogModalData;
 

diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h
index 677dd03e76ec1c0f6713a06e3906250979576f61..08a393ff91bc4cbf1687dbc2ec67c2d132a4e782 100644 (file)
--- 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 a4e579fdf96f7f4388f735f68d5193612bcb237a..6a59683072c939e8caf64f73f8aa743a5906d9a2 100644 (file)
--- 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 bd2657bc319e8d476f65abb601504751b7623772..02344bb77137ec57daa82271cd44597cc0046baa 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 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 58428be7a86af42b04a029099a2cdb530e78227d..8ae6255e1f295d736c9d5b077a0943e3abb978e6 100644 (file)
--- 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 1d5699f3c719b8ac3696d84230441f8bb5b27a18..b3de89d800f0064593b1d812cfe3ae1f5c380fc7 100644 (file)
--- 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 55f5356b5d12f5cfd6cbef76d5d74b446e698c87..401feb3d01b78d8af8096308e172c22482f2a2d6 100644 (file)
--- 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 c48fd86a224243a452d9a80dfa46372a4f95966e..e191ad69bce3db22424f9517a48f296e0a47efa1 100644 (file)
--- 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 2ae179f41b564d1dc56894c903c619195a0871b9..4372ce743b4dff556c3d52d432815ad7e8c07d75 100644 (file)
--- 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 eded1fa2d154d2fa2cb8706e9fb23d9f9743bd27..cb1a3dc4f5db93637a470d0b8fcae45dfce2ddb2 100644 (file)
--- 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 1fd907bc1790a077d1bff8d4471975863d8c7e16..820768cca032258b7279015bb925f66b6f414e64 100644 (file)
--- 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 01c8514cdf8067cd74e79490791b2549a1682860..125075214a396f13776291963791af58a43d74d4 100644 (file)
--- 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 92d0e75173a08165ff54b3972b74a02dc83dc605..26e02b85a31a7fb9a4654e4303ed0af5c5dc0e7a 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 wxChar) wxRadioButtonNameStr[];
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/radiobut.h"

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index e19f3de923e173dfcfb7ffef420f0892dd9b2bbf..2c39fb25596e845428e5f0f8c949c174826f5408 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 wxChar) wxScrollBarNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control

diff --git a/include/wx/slider.h b/include/wx/slider.h
index a58b942be47eb86c612bcf8fe1fbb923d5874274..12e488c0993455d162b63b587990a808dac43ba1 100644 (file)
--- 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 80b4d2dcf819289760fd15993b5707bc483fa05c..bdd278fd075522d04fda0f1ea6e869ab4183d90d 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 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 aea08aca5efb4727f4ff730e30c46bb51e422c6f..29ab7c42e0abe857959de886057b8ec5d705652a 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 wxChar) wxStaticBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 18d48a7f688e72bcb4ef0b948a4e5d6a9f9822bd..f204805800917d47f51e949b6ba47e42378f1b64 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*) 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 97f7f5441472957d99e4df1861e8697c76cd8f6c..4ac8badb076be8192138b8e93e749359f00fb3e2 100644 (file)
--- 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 44f022092bc0b5807fcaed86ccb93b6ee187ba80..2414b2c56b706ce884f841de582e0dcb64311f64 100644 (file)
--- 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 df9b73ce789aed73d3f07027b95dbbd17bbc2376..48e9ae640f795b2f3156bf0df3e3f128e52edb15 100644 (file)
--- 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 88e4b987c437fa60a68768fb3bddf1bb94d58dc8..7aeecdc65abb9a26099a0ebe5f2bbd44e643b8e2 100644 (file)
--- 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 bd9ae42ff0c30a733219ba870b1220dda2301cc2..445b4c28bc3e01a18cbdaac55eb7addc45959c15 100644 (file)
--- 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 26872c44f58d9432931e9ba3b33560bd1b01f249..8a006580667fa291f257421f7788ad06188f739a 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 wxChar) wxDialogNameStr[];
 class WXDLLEXPORT wxWindowDisabler;
 class WXDLLEXPORT wxEventLoop;
 

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 6c306155e4d439886467c904d3d854c5a41cb756..1b75320de439329becebb0c37aaf5f39c9a6b62c 100644 (file)
--- 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 ecf4fc9217910c0371f0a85fb7a269963e94760b..4f4144bd0aec01d451411eb7a29bb24d545c8e12 100644 (file)
--- 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,