From 1e20b249bf0629e4a4b4db3c7e0da0428ed6e42d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 Sep 2015 00:36:12 +0200
Subject: [PATCH] Use DLL declarations consistently for wxCollapsibleHeaderCtrl

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.
---
 include/wx/collheaderctrl.h         | 7 ++++---
 include/wx/generic/collheaderctrl.h | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/wx/collheaderctrl.h b/include/wx/collheaderctrl.h
index 4acfe69548..2364218d8e 100644
--- a/include/wx/collheaderctrl.h
+++ b/include/wx/collheaderctrl.h
@@ -23,7 +23,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsibleHeaderCtrlNameStr[];
 // wxGenericCollapsibleHeaderCtrl
 //
 
-class wxCollapsibleHeaderCtrlBase : public wxControl
+class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrlBase : public wxControl
 {
 public:
     wxCollapsibleHeaderCtrlBase() { }
@@ -74,11 +74,12 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEHEADER_CHANGED, wxCo
 #define EVT_COLLAPSIBLEHEADER_CHANGED(id, 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"
 
-class wxCollapsibleHeaderCtrl : public wxGenericCollapsibleHeaderCtrl
+class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrl
+    : public wxGenericCollapsibleHeaderCtrl
 {
 public:
     wxCollapsibleHeaderCtrl() { }
diff --git a/include/wx/generic/collheaderctrl.h b/include/wx/generic/collheaderctrl.h
index 45612f5f1e..b2dd3582c2 100644
--- a/include/wx/generic/collheaderctrl.h
+++ b/include/wx/generic/collheaderctrl.h
@@ -10,7 +10,8 @@
 #ifndef _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_
 #define _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_
 
-class wxGenericCollapsibleHeaderCtrl : public wxCollapsibleHeaderCtrlBase
+class WXDLLIMPEXP_CORE wxGenericCollapsibleHeaderCtrl
+    : public wxCollapsibleHeaderCtrlBase
 {
 public:
     wxGenericCollapsibleHeaderCtrl() { Init(); }