Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DLL declarations consistently for wxCollapsibleHeaderCtrl

Browse Source 
Export this class and its base classes (to avoid MSVC warnings about using
non-DLL-exported base classes for a DLL-exported one) from core DLL.
This commit is contained in:
Vadim Zeitlin
2015-09-23 00:36:12 +02:00
parent 8a0dc9ecdb
commit 1e20b249bf
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/collheaderctrl.h
View File

@@ -23,7 +23,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsibleHeaderCtrlNameStr[];
// wxGenericCollapsibleHeaderCtrl // wxGenericCollapsibleHeaderCtrl
// //
class wxCollapsibleHeaderCtrlBase : public wxControl class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrlBase : public wxControl
{ {
public: public:
wxCollapsibleHeaderCtrlBase() { } wxCollapsibleHeaderCtrlBase() { }
@@ -74,11 +74,12 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEHEADER_CHANGED, wxCo
#define EVT_COLLAPSIBLEHEADER_CHANGED(id, fn) \ #define EVT_COLLAPSIBLEHEADER_CHANGED(id, fn) \
wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEHEADER_CHANGED, id, wxCollapsibleHeaderChangedHandler(fn)) wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEHEADER_CHANGED, id, wxCollapsibleHeaderChangedHandler(fn))
// There currently only is the native implementation, use for all ports // Currently there is only the native implementation, use it for all ports.
#include "wx/generic/collheaderctrl.h" #include "wx/generic/collheaderctrl.h"
class wxCollapsibleHeaderCtrl : public wxGenericCollapsibleHeaderCtrl class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrl
: public wxGenericCollapsibleHeaderCtrl
{ {
public: public:
wxCollapsibleHeaderCtrl() { } wxCollapsibleHeaderCtrl() { }

3
include/wx/generic/collheaderctrl.h
View File

@@ -10,7 +10,8 @@
#ifndef _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_ #ifndef _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_
#define _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_ #define _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_
class wxGenericCollapsibleHeaderCtrl : public wxCollapsibleHeaderCtrlBase class WXDLLIMPEXP_CORE wxGenericCollapsibleHeaderCtrl
: public wxCollapsibleHeaderCtrlBase
{ {
public: public:
wxGenericCollapsibleHeaderCtrl() { Init(); } wxGenericCollapsibleHeaderCtrl() { Init(); }