Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / collpane.h

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index 8ff545d3bcda9be57ee2dc287c3f461ea7f2782c..337000e640cbbb447274f9406c2ecc0e1f2cb4eb 100644 (file)
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -19,6 +19,8 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+// class name
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
 
 // ----------------------------------------------------------------------------
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane


@@ -49,16 +51,16 @@ public:
 // event types and macros
 // ----------------------------------------------------------------------------
 
 // event types and macros
 // ----------------------------------------------------------------------------
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, 1102)
-END_DECLARE_EVENT_TYPES()
+class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
+
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );

 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
 public:
     wxCollapsiblePaneEvent() {}
     wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed)
 
 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);
         m_bCollapsed(collapsed)
     {
         SetEventObject(generator);


@@ -84,13 +86,13 @@ private:
 typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEvent&);
 
 #define wxCollapsiblePaneEventHandler(func) \
 typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEvent&);
 
 #define wxCollapsiblePaneEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCollapsiblePaneEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)

 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
 
 #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__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)

     #include "wx/gtk/collpane.h"
 #else
     #include "wx/generic/collpaneg.h"
     #include "wx/gtk/collpane.h"
 #else
     #include "wx/generic/collpaneg.h"


@@ -99,6 +101,9 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 
     #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 

+// old wxEVT_COMMAND_* constant
+#define wxEVT_COMMAND_COLLPANE_CHANGED   wxEVT_COLLAPSIBLEPANE_CHANGED
+

 #endif // wxUSE_COLLPANE
 
 #endif // _WX_COLLAPSABLE_PANE_H_BASE_
 #endif // wxUSE_COLLPANE
 
 #endif // _WX_COLLAPSABLE_PANE_H_BASE_