don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation

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

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 2102a1bb51cbbd99ed2dcec9f7f6a336a3ccb5fa..239d5dcec6e83dbc5974a110f469a935b2073f4f 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -155,6 +155,12 @@ public:
     // Gets the sash position
     int GetSashPosition() const { return m_sashPosition; }
 
     // Gets the sash position
     int GetSashPosition() const { return m_sashPosition; }
 

+    // Set the sash gravity
+    void SetSashGravity(double gravity);
+
+    // Gets the sash gravity
+    double GetSashGravity() const { return m_sashGravity; }
+

     // If this is zero, we can remove panes by dragging the sash.
     void SetMinimumPaneSize(int min);
     int GetMinimumPaneSize() const { return m_minimumPaneSize; }
     // If this is zero, we can remove panes by dragging the sash.
     void SetMinimumPaneSize(int min);
     int GetMinimumPaneSize() const { return m_minimumPaneSize; }


@@ -212,6 +218,10 @@ public:
     void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; }
     bool GetNeedUpdating() const { return m_needUpdating ; }
 
     void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; }
     bool GetNeedUpdating() const { return m_needUpdating ; }
 

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

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


@@ -222,7 +232,6 @@ protected:
     // by the user code
     inline bool DoSendEvent(wxSplitterEvent& event);
 
     // by the user code
     inline bool DoSendEvent(wxSplitterEvent& event);
 

-protected:

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -261,6 +270,11 @@ protected:
     // redraw the splitter if its "hotness" changed if necessary
     void RedrawIfHotSensitive(bool isHot);
 
     // redraw the splitter if its "hotness" changed if necessary
     void RedrawIfHotSensitive(bool isHot);
 

+    // return the best size of the splitter equal to best sizes of its
+    // subwindows
+    virtual wxSize DoGetBestSize() const;
+
+

     wxSplitMode m_splitMode;
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;
     wxSplitMode m_splitMode;
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;


@@ -268,6 +282,8 @@ protected:
     int         m_oldX;
     int         m_oldY;
     int         m_sashPosition; // Number of pixels from left or top
     int         m_oldX;
     int         m_oldY;
     int         m_sashPosition; // Number of pixels from left or top

+    double      m_sashGravity;
+    wxSize      m_lastSize;

     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging
     int         m_firstX;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging
     int         m_firstX;