More XRCed updates from Roman

[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..a3b2f223636175b25cac5297685fbdba706c2fc3 100644 (file)
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -13,6 +13,13 @@
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_
 
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_
 

+#ifdef GIZMOISDLL
+#define GIZMODLLEXPORT WXDLLEXPORT
+#else
+#define GIZMODLLEXPORT
+#endif
+
+

 /*
 
     wxDynamicSashWindow
 /*
 
     wxDynamicSashWindow


@@ -44,7 +51,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
     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.
     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.


@@ -73,11 +80,19 @@ class wxScrollBar;
 
 
 /*
 
 
 /*

-    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.
 */
     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

 
 
 /*
 
 
 /*


@@ -87,11 +102,14 @@ 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 wxDynamicSashSplitEvent : public wxCommandEvent {
+class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent {

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

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

     wxDynamicSashSplitEvent(wxObject *target);
 
     wxDynamicSashSplitEvent(wxObject *target);
 

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

 private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
 };


@@ -106,30 +124,36 @@ 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 wxDynamicSashUnifyEvent : public wxCommandEvent {
+class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent {

 public:
     wxDynamicSashUnifyEvent();
 public:
     wxDynamicSashUnifyEvent();

+    wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}

     wxDynamicSashUnifyEvent(wxObject *target);
 
     wxDynamicSashUnifyEvent(wxObject *target);
 

+    virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
 };
 

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

 /*
     wxDynamicSashWindow.  See above.
 */
 /*
     wxDynamicSashWindow.  See above.
 */

-class wxDynamicSashWindow : public wxWindow {
+class GIZMODLLEXPORT 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 | wxMANAGE_SCROLLBARS,
+                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,

                         const wxString& name = "dynamicSashWindow");
     virtual ~wxDynamicSashWindow();
 
     virtual bool Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                         const wxString& name = "dynamicSashWindow");
     virtual ~wxDynamicSashWindow();
 
     virtual bool Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

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

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