remove unused variable assignment, closes #14928

[wxWidgets.git] / include / wx / generic / splitter.h

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index d009107cd0999cdf57cb112c0e09906a7252b543..39d9aed8c84aad4197f4b129a2e867a5aae0786d 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/splitter.h
+// Name:        wx/generic/splitter.h

 // Purpose:     wxSplitterWindow class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSplitterWindow class
 // Author:      Julian Smart
 // Modified by:


@@ -49,7 +49,7 @@ enum
 //    to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
 //    standard).
 
 //    to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
 //    standard).
 

-class WXDLLIMPEXP_CORE wxSplitterWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxSplitterWindow: public wxNavigationEnabled<wxWindow>

 {
 public:
 
 {
 public:
 


@@ -133,14 +133,17 @@ public:
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 

-    // Sets the sash size
-    void SetSashSize(int width) { m_sashSize = width; }
-

     // Sets the border size
     void SetBorderSize(int WXUNUSED(width)) { }
 
     // Sets the border size
     void SetBorderSize(int WXUNUSED(width)) { }
 

-    // Gets the sash size
+    // Hide or show the sash and test whether it's currently hidden.
+    void SetSashInvisible(bool invisible = true);
+    bool IsSashInvisible() const { return HasFlag(wxSP_NOSASH); }
+
+    // Gets the current sash size which may be 0 if it's hidden and the default
+    // sash size.

     int GetSashSize() const;
     int GetSashSize() const;

+    int GetDefaultSashSize() const;

 
     // Gets the border size
     int GetBorderSize() const;
 
     // Gets the border size
     int GetBorderSize() const;


@@ -193,6 +196,9 @@ public:
     // Handles mouse events
     void OnMouseEvent(wxMouseEvent& ev);
 
     // Handles mouse events
     void OnMouseEvent(wxMouseEvent& ev);
 

+    // Aborts dragging mode
+    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
+

     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 
     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 


@@ -206,18 +212,19 @@ public:
     virtual void DrawSashTracker(int x, int y);
 
     // Tests for x, y over sash
     virtual void DrawSashTracker(int x, int y);
 
     // Tests for x, y over sash

-    virtual bool SashHitTest(int x, int y, int tolerance = 5);
+    virtual bool SashHitTest(int x, int y);

 
     // Resizes subwindows
     virtual void SizeWindows();
 
 
     // Resizes subwindows
     virtual void SizeWindows();
 

-    void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; }
-    bool GetNeedUpdating() const { return m_needUpdating ; }
-

 #ifdef __WXMAC__
     virtual bool MacClipGrandChildren() const { return true ; }
 #endif
 
 #ifdef __WXMAC__
     virtual bool MacClipGrandChildren() const { return true ; }
 #endif
 

+    // Sets the sash size: this doesn't do anything and shouldn't be used at
+    // all any more.
+    wxDEPRECATED_INLINE( void SetSashSize(int WXUNUSED(width)), return; )
+

 protected:
     // event handlers
 #if defined(__WXMSW__) || defined(__WXMAC__)
 protected:
     // event handlers
 #if defined(__WXMSW__) || defined(__WXMAC__)


@@ -275,16 +282,15 @@ protected:
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;
     int         m_dragMode;
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;
     int         m_dragMode;

-    int         m_oldX;
-    int         m_oldY;
+    int         m_oldX;         // current tracker position if not live mode
+    int         m_oldY;         // current tracker position if not live mode

     int         m_sashPosition; // Number of pixels from left or top
     double      m_sashGravity;
     int         m_sashPosition; // Number of pixels from left or top
     double      m_sashGravity;

-    int         m_sashSize;

     wxSize      m_lastSize;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging
     wxSize      m_lastSize;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging

-    int         m_firstX;
-    int         m_firstY;
+    wxPoint     m_ptStart;      // mouse position when dragging started
+    int         m_sashStart;    // sash position when dragging started

     int         m_minimumPaneSize;
     wxCursor    m_sashCursorWE;
     wxCursor    m_sashCursorNS;
     int         m_minimumPaneSize;
     wxCursor    m_sashCursorWE;
     wxCursor    m_sashCursorNS;


@@ -294,11 +300,8 @@ protected:
     bool        m_needUpdating:1;
     bool        m_permitUnsplitAlways:1;
     bool        m_isHot:1;
     bool        m_needUpdating:1;
     bool        m_permitUnsplitAlways:1;
     bool        m_isHot:1;

-    bool        m_checkRequestedSashPosition:1;

 
 private:
 
 private:

-    WX_DECLARE_CONTROL_CONTAINER();
-

     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxSplitterWindow);
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxSplitterWindow);