[#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 10b6b94c80d6818886dbcaf24722884c91541068..617463e76ceaa79caa7e8bd825a9b25b5eaa1771 100644 (file)
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -13,6 +13,8 @@
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_
 
+#include "wx/gizmos/gizmos.h"
+
 /*
 
     wxDynamicSashWindow
@@ -44,7 +46,7 @@
     for instance, you wish to scroll a subwindow of the view you add to
     your wxDynamicSashWindow object, rather than scrolling the whole view.)
     In this case, you will need to construct your wxDynamicSashWindow without
-    the wxMANAGE_SCROLLBARS style and  you will need to use the
+    the wxDS_MANAGE_SCROLLBARS style and  you will need to use the
     GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
     controls and call SetEventHanler() on them to redirect the scrolling
     events whenever your window is reparented by wxDyanmicSashWindow.
@@ -59,25 +61,49 @@
 */
 
 
-#include <wx/event.h>
-#include <wx/window.h>
-class 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)
+#include "wx/event.h"
+#include "wx/window.h"
 
-#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))
+class WXDLLIMPEXP_CORE wxScrollBar;
 
+// ----------------------------------------------------------------------------
+// dynamic sash styles
+// ----------------------------------------------------------------------------
 
 /*
-    wxMANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
+    wxDS_MANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
     will cause it to respond to scrollbar events for your application by
     automatically scrolling the child view.
 */
-#define wxMANAGE_SCROLLBARS     0x00800000
+#define wxDS_MANAGE_SCROLLBARS  0x0010
+
+
+/*
+  wxDS_DRAG_CORNER style indicates that the views can also be resized by
+  dragging the corner piece between the scrollbars, and which is reflected up
+  to the frame if necessary.
+*/
+#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))
 
 
 /*
@@ -87,11 +113,16 @@ class wxScrollBar;
     a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
     automatically reparent it to the proper place in its window hierarchy.
 */
-class wxDynamicSashSplitEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent
+{
 public:
     wxDynamicSashSplitEvent();
+    wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event)
+        : wxCommandEvent(event) { }
     wxDynamicSashSplitEvent(wxObject *target);
 
+    virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }
+
 private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
 };
@@ -106,31 +137,54 @@ private:
     the scrollbars' event handlers connected to your view's event handler
     class.
 */
-class wxDynamicSashUnifyEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent
+{
 public:
     wxDynamicSashUnifyEvent();
+    wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
     wxDynamicSashUnifyEvent(wxObject *target);
 
+    virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
+
 private:
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
+    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent)
 };
 
-/*
-    wxDynamicSashWindow.  See above.
-*/
-class wxDynamicSashWindow : public wxWindow {
+typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&);
+typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashUnifyEvent&);
+
+#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;
+
+class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow
+{
 public:
     wxDynamicSashWindow();
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
-                        const wxString& name = "dynamicSashWindow");
+                        long style = wxDS_DEFAULT,
+                        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 | wxMANAGE_SCROLLBARS,
-                        const wxString& name = "dynamicSashWindow");
+                        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;
 
@@ -144,5 +198,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashWindow)
 };
 
+#endif // _WX_DYNAMICSASH_H_
 
-#endif