Move constant strings to .rodata/.data.rel.ro ELF segment from .data by making them really const.
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
This commit is contained in:
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxButton;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr;
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxButton
|
||||
|
@@ -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;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr;
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxDialog
|
||||
|
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr;
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxGaugeBox
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
{
|
||||
|
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxToggleBitmapButton;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr;
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxToggleBitmapButton
|
||||
|
Reference in New Issue
Block a user