X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d34ad9ea8910361e3d8443ddda0ee5554dc6480d..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/collpane.h diff --git a/include/wx/collpane.h b/include/wx/collpane.h index ca8f6881bb..8ff545d3bc 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -24,10 +24,10 @@ // wxCollapsiblePaneBase: interface for wxCollapsiblePane // ---------------------------------------------------------------------------- -#define wxCP_DEFAULT_STYLE (wxNO_BORDER) +#define wxCP_DEFAULT_STYLE (wxTAB_TRAVERSAL | wxNO_BORDER) #define wxCP_NO_TLW_RESIZE (0x0002) -class WXDLLIMPEXP_ADV wxCollapsiblePaneBase : public wxControl +class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl { public: wxCollapsiblePaneBase() {} @@ -50,10 +50,10 @@ public: // ---------------------------------------------------------------------------- BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_COLLPANE_CHANGED, 1102) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, 1102) END_DECLARE_EVENT_TYPES() -class WXDLLIMPEXP_ADV wxCollapsiblePaneEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent { public: wxCollapsiblePaneEvent() {} @@ -90,7 +90,7 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn)) -#if defined(__WXGTK24__) +#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/collpane.h" #else #include "wx/generic/collpaneg.h"