[#1472076] Fixes after stock gdi changes within core library.

[wxWidgets.git] / contrib / include / wx / gizmos / dynamicsash.h

diff --git a/contrib/include/wx/gizmos/dynamicsash.h b/contrib/include/wx/gizmos/dynamicsash.h
index 2a37a2be3cfa23440f06495cfd34a5ee76354ddc..617463e76ceaa79caa7e8bd825a9b25b5eaa1771 100644 (file)
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -61,18 +61,14 @@
 */
 
 
 */
 
 

-#include <wx/event.h>
-#include <wx/window.h>
-class wxScrollBar;
+#include "wx/event.h"
+#include "wx/window.h"

 
 

+class WXDLLIMPEXP_CORE wxScrollBar;

 
 

-#define wxEVT_DYNAMIC_SASH_BASE             (((int)('d' - 'a') << 11) | ((int)('s' - 'a') << 6) | ((int)('h' - 'a') << 1))
-#define wxEVT_DYNAMIC_SASH_SPLIT            (wxEVT_DYNAMIC_SASH_BASE + 1)
-#define wxEVT_DYNAMIC_SASH_UNIFY            (wxEVT_DYNAMIC_SASH_BASE + 2)
-
-#define EVT_DYNAMIC_SASH_SPLIT(id, func)    EVT_CUSTOM(wxEVT_DYNAMIC_SASH_SPLIT, (id), (func))
-#define EVT_DYNAMIC_SASH_UNIFY(id, func)    EVT_CUSTOM(wxEVT_DYNAMIC_SASH_UNIFY, (id), (func))
-
+// ----------------------------------------------------------------------------
+// dynamic sash styles
+// ----------------------------------------------------------------------------

 
 /*
     wxDS_MANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
 
 /*
     wxDS_MANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which


@@ -89,6 +85,26 @@ class wxScrollBar;
 */
 #define wxDS_DRAG_CORNER        0x0020
 
 */
 #define wxDS_DRAG_CORNER        0x0020
 

+/*
+    Default style for wxDynamicSashWindow.
+ */
+#define wxDS_DEFAULT            wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER
+
+// ----------------------------------------------------------------------------
+// dynamic sash events
+// ----------------------------------------------------------------------------
+
+extern WXDLLIMPEXP_GIZMOS const wxEventType wxEVT_DYNAMIC_SASH_SPLIT;
+extern WXDLLIMPEXP_GIZMOS const wxEventType wxEVT_DYNAMIC_SASH_UNIFY;
+
+#define EVT_DYNAMIC_SASH_SPLIT(id, func) \
+    wx__DECLARE_EVT1(wxEVT_DYNAMIC_SASH_SPLIT, id, \
+                        wxDynamicSashSplitEventHandler(func))
+
+#define EVT_DYNAMIC_SASH_UNIFY(id, func) \
+    wx__DECLARE_EVT1(wxEVT_DYNAMIC_SASH_UNIFY, id, \
+                        wxDynamicSashUnifyEventHandler(func))
+

 
 /*
     wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
 
 /*
     wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow


@@ -97,10 +113,12 @@ class wxScrollBar;
     a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
     automatically reparent it to the proper place in its window hierarchy.
 */
     a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
     automatically reparent it to the proper place in its window hierarchy.
 */

-class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent
+{

 public:
     wxDynamicSashSplitEvent();
 public:
     wxDynamicSashSplitEvent();

-    wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }
+    wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event)
+        : wxCommandEvent(event) { }

     wxDynamicSashSplitEvent(wxObject *target);
 
     virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }
     wxDynamicSashSplitEvent(wxObject *target);
 
     virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }


@@ -119,7 +137,8 @@ private:
     the scrollbars' event handlers connected to your view's event handler
     class.
 */
     the scrollbars' event handlers connected to your view's event handler
     class.
 */

-class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent
+{

 public:
     wxDynamicSashUnifyEvent();
     wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
 public:
     wxDynamicSashUnifyEvent();
     wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}


@@ -128,29 +147,43 @@ public:
     virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
 
 private:
     virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
+    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent)

 };
 
 typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&);
 typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashUnifyEvent&);
 
 };
 
 typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&);
 typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashUnifyEvent&);
 

-/*
-    wxDynamicSashWindow.  See above.
-*/
+#define wxDynamicSashSplitEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction) \
+        wxStaticCastEvent(wxDynamicSashSplitEventFunction, &func)
+
+#define wxDynamicSashUnifyEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction) \
+        wxStaticCastEvent(wxDynamicSashUnifyEventFunction, &func)
+
+#define wx__DECLARE_TREEEVT(evt, id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TREE_ ## evt, id, wxTreeEventHandler(fn))
+
+// ----------------------------------------------------------------------------
+// wxDynamicSashWindow itself
+// ----------------------------------------------------------------------------
+

 WXDLLIMPEXP_GIZMOS extern const wxChar* wxDynamicSashWindowNameStr;
 
 WXDLLIMPEXP_GIZMOS extern const wxChar* wxDynamicSashWindowNameStr;
 

-class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow
+{

 public:
     wxDynamicSashWindow();
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 public:
     wxDynamicSashWindow();
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
+                        long style = wxDS_DEFAULT,

                         const wxString& name = wxDynamicSashWindowNameStr);
     virtual ~wxDynamicSashWindow();
 
     virtual bool Create(wxWindow *parent, wxWindowID id,
                         const wxString& name = wxDynamicSashWindowNameStr);
     virtual ~wxDynamicSashWindow();
 
     virtual bool Create(wxWindow *parent, wxWindowID id,

-                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
+                        const wxPoint& pos = wxDefaultPosition,
+                        const wxSize& size = wxDefaultSize,
+                        long style = wxDS_DEFAULT,

                         const wxString& name = wxDynamicSashWindowNameStr);
     virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
     virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;
                         const wxString& name = wxDynamicSashWindowNameStr);
     virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
     virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;


@@ -165,5 +198,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashWindow)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDynamicSashWindow)
 };
 

+#endif // _WX_DYNAMICSASH_H_

 
 

-#endif