yet another help browser visual enhancement

[wxWidgets.git] / src / generic / splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 70ac816c857e5874c8f2f7c431eccb6ccf5774b9..31aea495e1752f47834d36b9b3d2c3ab727d269f 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -31,8 +31,8 @@
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"

+#include "wx/settings.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
 


@@ -49,7 +49,6 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_SPLITTER_DCLICK(-1,           wxSplitterWindow::OnDoubleClick)
     EVT_SPLITTER_UNSPLIT(-1,          wxSplitterWindow::OnUnsplitEvent)
 END_EVENT_TABLE()
     EVT_SPLITTER_DCLICK(-1,           wxSplitterWindow::OnDoubleClick)
     EVT_SPLITTER_UNSPLIT(-1,          wxSplitterWindow::OnUnsplitEvent)
 END_EVENT_TABLE()

-#endif

 
 wxSplitterWindow::wxSplitterWindow()
 {
 
 wxSplitterWindow::wxSplitterWindow()
 {


@@ -163,8 +162,8 @@ void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 {
 
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 {

-    long x = event.GetX();
-    long y = event.GetY();
+    wxCoord x = (wxCoord)event.GetX(),
+            y = (wxCoord)event.GetY();

 
     // reset the cursor
 #ifdef __WXMOTIF__
 
     // reset the cursor
 #ifdef __WXMOTIF__


@@ -184,9 +183,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
 
             if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
 
             if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)

-           {
-               DrawSashTracker(x, y);
-           }
+            {
+                DrawSashTracker(x, y);
+            }

 
             m_oldX = x;
             m_oldY = y;
 
             m_oldX = x;
             m_oldY = y;


@@ -201,9 +200,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
         // Erase old tracker
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
 
         // Erase old tracker
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)

-       {
+        {

             DrawSashTracker(m_oldX, m_oldY);
             DrawSashTracker(m_oldX, m_oldY);

-       }
+        }

 
         // Obtain window size. We are only interested in the dimension the sash
         // splits up
 
         // Obtain window size. We are only interested in the dimension the sash
         // splits up


@@ -303,9 +302,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
         // Erase old tracker
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
 
         // Erase old tracker
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)

-       {
+        {

             DrawSashTracker(m_oldX, m_oldY);
             DrawSashTracker(m_oldX, m_oldY);

-       }
+        }

 
         if (m_splitMode == wxSPLIT_VERTICAL)
             x = new_sash_position;
 
         if (m_splitMode == wxSPLIT_VERTICAL)
             x = new_sash_position;


@@ -334,14 +333,14 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
         // Draw new one
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
 
         // Draw new one
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)

-       {
+        {

             DrawSashTracker(m_oldX, m_oldY);
             DrawSashTracker(m_oldX, m_oldY);

-       }
-       else
-       {
+        }
+        else
+        {

             m_sashPosition = new_sash_position;
             m_sashPosition = new_sash_position;

-           m_needUpdating = TRUE;
-       }
+            m_needUpdating = TRUE;
+        }

     }
     else if ( event.LeftDClick() )
     {
     }
     else if ( event.LeftDClick() )
     {


@@ -423,8 +422,6 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
         else
             return FALSE;
     }
         else
             return FALSE;
     }

-
-    return FALSE;

 }
 
 // Draw 3D effect borders
 }
 
 // Draw 3D effect borders


@@ -491,14 +488,14 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);

-                       int xShadow = m_borderSize ? m_borderSize - 1 : 0 ;
+                        int xShadow = m_borderSize ? m_borderSize - 1 : 0 ;

             dc.DrawLine(m_sashPosition, xShadow , m_sashPosition, h-m_borderSize);
 
             dc.SetPen(*m_hilightPen);
             dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2);
 
             dc.SetPen(*m_mediumShadowPen);
             dc.DrawLine(m_sashPosition, xShadow , m_sashPosition, h-m_borderSize);
 
             dc.SetPen(*m_hilightPen);
             dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2);
 
             dc.SetPen(*m_mediumShadowPen);

-                       int yMedium = m_borderSize ? h-m_borderSize+1 : h ;
+                        int yMedium = m_borderSize ? h-m_borderSize+1 : h ;

             dc.DrawLine(m_sashPosition+m_sashSize-2, xShadow, m_sashPosition+m_sashSize-2, yMedium);
 
             dc.SetPen(*m_darkShadowPen);
             dc.DrawLine(m_sashPosition+m_sashSize-2, xShadow, m_sashPosition+m_sashSize-2, yMedium);
 
             dc.SetPen(*m_darkShadowPen);


@@ -650,8 +647,8 @@ void wxSplitterWindow::SizeWindows()
         }
     }
     wxClientDC dc(this);
         }
     }
     wxClientDC dc(this);

-       if ( m_borderSize > 0 )
-               DrawBorders(dc);
+    if ( m_borderSize > 0 )
+        DrawBorders(dc);

     DrawSash(dc);
 }
 
     DrawSash(dc);
 }
 


@@ -892,8 +889,7 @@ void wxSplitterWindow::OnDoubleClick(wxSplitterEvent& event)
     // for compatibility, call the virtual function
     OnDoubleClickSash(event.GetX(), event.GetY());
 
     // for compatibility, call the virtual function
     OnDoubleClickSash(event.GetX(), event.GetY());
 

-    if ( GetMinimumPaneSize() == 0
-        || m_permitUnsplitAlways)
+    if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )

     {
         Unsplit();
     }
     {
         Unsplit();
     }


@@ -903,8 +899,9 @@ void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {
     wxWindow *win = event.GetWindowBeingRemoved();
 
 {
     wxWindow *win = event.GetWindowBeingRemoved();
 

+    // do it before calling OnUnsplit() which may delete the window
+    win->Show(FALSE);
+

     // for compatibility, call the virtual function
     OnUnsplit(win);
     // for compatibility, call the virtual function
     OnUnsplit(win);

-
-    win->Show(FALSE);

 }
 }