declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
extern WXDLLIMPEXP_PROPGRID const wxChar *wxPropertyGridManagerNameStr;
|
||||
extern WXDLLIMPEXP_DATA_PROPGRID(const char) wxPropertyGridManagerNameStr[];
|
||||
#endif
|
||||
|
||||
/** @class wxPropertyGridPage
|
||||
@@ -260,7 +260,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxPGMAN_DEFAULT_STYLE,
|
||||
const wxChar* name = wxPropertyGridManagerNameStr );
|
||||
const wxString& name = wxPropertyGridManagerNameStr );
|
||||
|
||||
/** Destructor */
|
||||
virtual ~wxPropertyGridManager();
|
||||
@@ -320,7 +320,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxPGMAN_DEFAULT_STYLE,
|
||||
const wxChar* name = wxPropertyGridManagerNameStr );
|
||||
const wxString& name = wxPropertyGridManagerNameStr );
|
||||
|
||||
/**
|
||||
Enables or disables (shows/hides) categories according to parameter
|
||||
|
Reference in New Issue
Block a user