Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container...

[wxWidgets.git] / src / aui / framemanager.cpp

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 30ca612af45f534d5492842c92e6afff533e10ca..20e654791a10566761219ce1a9c129d8bb0a4eda 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17

-// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -3236,16 +3235,16 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
         // determine the mouse offset and the pane size, both in the
         // direction of the dock itself, and perpendicular to the dock
 
         // determine the mouse offset and the pane size, both in the
         // direction of the dock itself, and perpendicular to the dock
 

-        int offset, size;
+        int mouseOffset, size;

 
         if (part->orientation == wxVERTICAL)
         {
 
         if (part->orientation == wxVERTICAL)
         {

-            offset = pt.y - part->rect.y;
+            mouseOffset = pt.y - part->rect.y;

             size = part->rect.GetHeight();
         }
         else
         {
             size = part->rect.GetHeight();
         }
         else
         {

-            offset = pt.x - part->rect.x;
+            mouseOffset = pt.x - part->rect.x;

             size = part->rect.GetWidth();
         }
 
             size = part->rect.GetWidth();
         }
 


@@ -3253,7 +3252,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
         // if we are in the top/left part of the pane,
         // insert the pane before the pane being hovered over
 
         // if we are in the top/left part of the pane,
         // insert the pane before the pane being hovered over

-        if (offset <= size/2)
+        if (mouseOffset <= size/2)

         {
             drop_position = part->pane->dock_pos;
             DoInsertPane(panes,
         {
             drop_position = part->pane->dock_pos;
             DoInsertPane(panes,


@@ -3265,7 +3264,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
         // if we are in the bottom/right part of the pane,
         // insert the pane before the pane being hovered over
 
         // if we are in the bottom/right part of the pane,
         // insert the pane before the pane being hovered over

-        if (offset > size/2)
+        if (mouseOffset > size/2)

         {
             drop_position = part->pane->dock_pos+1;
             DoInsertPane(panes,
         {
             drop_position = part->pane->dock_pos+1;
             DoInsertPane(panes,


@@ -3367,15 +3366,15 @@ void wxAuiManager::ShowHint(const wxRect& rect)
                     pane.frame &&
                         pane.frame->IsShown())
             {
                     pane.frame &&
                         pane.frame->IsShown())
             {

-                wxRect rect = pane.frame->GetRect();
+                wxRect r = pane.frame->GetRect();

 #ifdef __WXGTK__
                 // wxGTK returns the client size, not the whole frame size
 #ifdef __WXGTK__
                 // wxGTK returns the client size, not the whole frame size

-                rect.width += 15;
-                rect.height += 35;
-                rect.Inflate(5);
+                r.width += 15;
+                r.height += 35;
+                r.Inflate(5);

 #endif
 
 #endif
 

-                clip.Subtract(rect);
+                clip.Subtract(r);

             }
         }
 
             }
         }
 


@@ -4658,8 +4657,8 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
 
         pane.SetFlag(wxAuiPaneInfo::actionPane, true);
 
 
         pane.SetFlag(wxAuiPaneInfo::actionPane, true);
 

-        wxPoint pt = event.GetPosition();
-        DoDrop(m_docks, m_panes, pane, pt, m_actionOffset);
+        wxPoint point = event.GetPosition();
+        DoDrop(m_docks, m_panes, pane, point, m_actionOffset);

 
         // if DoDrop() decided to float the pane, set up
         // the floating pane's initial position
 
         // if DoDrop() decided to float the pane, set up
         // the floating pane's initial position