synchronize GTK2 minimum version in docs

[wxWidgets.git] / interface / wx / sashwin.h

diff --git a/interface/wx/sashwin.h b/interface/wx/sashwin.h
index 6ff15bed70adb664c88383875d67e08118517bce..3d5c1fd1366d0d170d9be36843bfcf74d9ffc8b1 100644 (file)
--- a/interface/wx/sashwin.h
+++ b/interface/wx/sashwin.h
@@ -3,9 +3,18 @@
 // Purpose:     interface of wxSashWindow
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxSashWindow
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+/**
+   wxSashWindow flags
+*/
+#define wxSW_NOBORDER         0x0000
+#define wxSW_BORDER           0x0020
+#define wxSW_3DSASH           0x0040
+#define wxSW_3DBORDER         0x0080
+#define wxSW_3D (wxSW_3DSASH | wxSW_3DBORDER)
+

 
 /**
     See wxSashWindow.
 
 /**
     See wxSashWindow.


@@ -52,10 +61,10 @@ enum wxSashDragStatus
 
     @beginEventEmissionTable{wxSashEvent}
     @event{EVT_SASH_DRAGGED(id, func)}
 
     @beginEventEmissionTable{wxSashEvent}
     @event{EVT_SASH_DRAGGED(id, func)}

-           Process a wxEVT_SASH_DRAGGED event, when the user has finished
+           Process a @c wxEVT_SASH_DRAGGED event, when the user has finished

            dragging a sash.
     @event{EVT_SASH_DRAGGED_RANGE(id1, id2, func)}
            dragging a sash.
     @event{EVT_SASH_DRAGGED_RANGE(id1, id2, func)}

-           Process a wxEVT_SASH_DRAGGED_RANGE event, when the user has
+           Process a @c wxEVT_SASH_DRAGGED_RANGE event, when the user has

            finished dragging a sash. The event handler is called when windows
            with ids in the given range have their sashes dragged.
     @endEventTable
            finished dragging a sash. The event handler is called when windows
            with ids in the given range have their sashes dragged.
     @endEventTable


@@ -134,17 +143,6 @@ public:
     */
     bool GetSashVisible(wxSashEdgePosition edge) const;
 
     */
     bool GetSashVisible(wxSashEdgePosition edge) const;
 

-    /**
-        Returns @true if the sash has a border, @false otherwise.
-        This function is obsolete since the sash border property is unused.
-
-        @param edge
-            Edge. One of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
-
-        @see SetSashBorder()
-    */
-    bool HasBorder(wxSashEdgePosition edge) const;
-

     /**
         Sets the maximum window size in the x direction.
     */
     /**
         Sets the maximum window size in the x direction.
     */


@@ -165,17 +163,6 @@ public:
     */
     virtual void SetMinimumSizeY(int min);
 
     */
     virtual void SetMinimumSizeY(int min);
 

-    /**
-        Call this function to give the sash a border, or remove the border.
-        This function is obsolete since the sash border property is unused.
-
-        @param edge
-            Edge to change. One of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
-        @param hasBorder
-            @true to give the sash a border visible, @false to remove it.
-    */
-    void SetSashBorder(wxSashEdgePosition edge, bool hasBorder);
-

     /**
         Call this function to make a sash visible or invisible on a particular edge.
 
     /**
         Call this function to make a sash visible or invisible on a particular edge.
 


@@ -212,9 +199,9 @@ public:
 
     @beginEventTable{wxSashEvent}
     @event{EVT_SASH_DRAGGED(id, func)}
 
     @beginEventTable{wxSashEvent}
     @event{EVT_SASH_DRAGGED(id, func)}

-        Process a wxEVT_SASH_DRAGGED event, when the user has finished dragging a sash.
+        Process a @c wxEVT_SASH_DRAGGED event, when the user has finished dragging a sash.

     @event{EVT_SASH_DRAGGED_RANGE(id1, id2, func)}
     @event{EVT_SASH_DRAGGED_RANGE(id1, id2, func)}

-        Process a wxEVT_SASH_DRAGGED_RANGE event, when the user has finished
+        Process a @c wxEVT_SASH_DRAGGED_RANGE event, when the user has finished

         dragging a sash. The event handler is called when windows with ids in
         the given range have their sashes dragged.
     @endEventTable
         dragging a sash. The event handler is called when windows with ids in
         the given range have their sashes dragged.
     @endEventTable


@@ -252,5 +239,11 @@ public:
         The return value is one of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
     */
     wxSashEdgePosition GetEdge() const;
         The return value is one of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
     */
     wxSashEdgePosition GetEdge() const;

+
+    
+    void SetEdge(wxSashEdgePosition edge);
+    void SetDragRect(const wxRect& rect);
+    void SetDragStatus(wxSashDragStatus status);

 };
 
 };
 

+wxEventType wxEVT_SASH_DRAGGED;