X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34424e1e7f118176d3b4d84193e6598d86ead73e..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/collpane.h

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index a52383bd6c..337000e640 100644
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -19,15 +19,17 @@
 
 #include "wx/control.h"
 
+// class name
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[];
 
 // ----------------------------------------------------------------------------
 // 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() {}
@@ -49,16 +51,16 @@ public:
 // event types and macros
 // ----------------------------------------------------------------------------
 
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_COLLPANE_CHANGED, 1102)
-END_DECLARE_EVENT_TYPES()
+class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
 
-class WXDLLIMPEXP_ADV wxCollapsiblePaneEvent : public wxCommandEvent
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );
+
+class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
 public:
     wxCollapsiblePaneEvent() {}
     wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed)
-        : wxCommandEvent(wxEVT_COMMAND_COLLPANE_CHANGED, id),
+        : wxCommandEvent(wxEVT_COLLAPSIBLEPANE_CHANGED, id),
         m_bCollapsed(collapsed)
     {
         SetEventObject(generator);
@@ -84,22 +86,24 @@ private:
 typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEvent&);
 
 #define wxCollapsiblePaneEventHandler(func) \
-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCollapsiblePaneEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
 
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/collpane.h"
 #else
     #include "wx/generic/collpaneg.h"
 
-    // use a typedef and not a #define to avoid problems with XRC forward declarations
-    typedef wxGenericCollapsiblePane wxCollapsiblePane;
+    // use #define and not a typedef to allow forward declaring the class
+    #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 
-#endif      // wxUSE_COLLPANE
+// old wxEVT_COMMAND_* constant
+#define wxEVT_COMMAND_COLLPANE_CHANGED   wxEVT_COLLAPSIBLEPANE_CHANGED
 
-#endif
-    // _WX_COLLAPSABLE_PANE_H_BASE_
+#endif // wxUSE_COLLPANE
+
+#endif // _WX_COLLAPSABLE_PANE_H_BASE_