Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change variables naming convention in wxAUI code.

Browse Source 
Use the standard wxWidgets camelCase convention instead of the
old_one_using_underscores for all the private variables.

Closes #13476.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-10-30 14:20:03 +00:00
parent ea10101a15
commit 9a29fe70bc
12 changed files with 1772 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/aui/floatpane.cpp
View File

@@ -54,17 +54,17 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
(pane.IsFixed()?0:wxRESIZE_BORDER)
)
{
m_owner_mgr = owner_mgr;
m_ownerMgr = owner_mgr;
m_moving = false;
m_mgr.SetManagedWindow(this);
m_solid_drag = true;
m_solidDrag = true;
// find out if the system supports solid window drag.
// on non-msw systems, this is assumed to be the case
#ifdef __WXMSW__
BOOL b = TRUE;
SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0);
m_solid_drag = b ? true : false;
m_solidDrag = b ? true : false;
#endif
SetExtraStyle(wxWS_EX_PROCESS_IDLE);
@@ -73,9 +73,9 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
wxAuiFloatingFrame::~wxAuiFloatingFrame()
{
// if we do not do this, then we can crash...
if (m_owner_mgr && m_owner_mgr->m_action_window == this)
if (m_ownerMgr && m_ownerMgr->m_actionWindow == this)
{
m_owner_mgr->m_action_window = NULL;
m_ownerMgr->m_actionWindow = NULL;
}
m_mgr.UnInit();
@@ -83,8 +83,8 @@ wxAuiFloatingFrame::~wxAuiFloatingFrame()
void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
{
m_pane_window = pane.window;
m_pane_window->Reparent(this);
m_paneWindow = pane.window;
m_paneWindow->Reparent(this);
wxAuiPaneInfo contained_pane = pane;
contained_pane.Dock().Center().Show().
@@ -108,7 +108,7 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
SetMinSize(pane.window->GetMinSize());
m_mgr.AddPane(m_pane_window, contained_pane);
m_mgr.AddPane(m_paneWindow, contained_pane);
m_mgr.Update();
if (pane.min_size.IsFullySpecified())
@@ -148,13 +148,13 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
if (size == wxDefaultSize)
size = pane.min_size;
if (size == wxDefaultSize)
size = m_pane_window->GetSize();
if (m_owner_mgr && pane.HasGripper())
size = m_paneWindow->GetSize();
if (m_ownerMgr && pane.HasGripper())
{
if (pane.HasGripperTop())
size.y += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
size.y += m_ownerMgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
else
size.x += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
size.x += m_ownerMgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
}
SetClientSize(size);
@@ -163,34 +163,34 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
{
return m_owner_mgr;
return m_ownerMgr;
}
void wxAuiFloatingFrame::OnSize(wxSizeEvent& WXUNUSED(event))
{
if (m_owner_mgr)
if (m_ownerMgr)
{
m_owner_mgr->OnFloatingPaneResized(m_pane_window, GetRect());
m_ownerMgr->OnFloatingPaneResized(m_paneWindow, GetRect());
}
}
void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt)
{
if (m_owner_mgr)
if (m_ownerMgr)
{
m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
m_ownerMgr->OnFloatingPaneClosed(m_paneWindow, evt);
}
if (!evt.GetVeto())
{
m_mgr.DetachPane(m_pane_window);
m_mgr.DetachPane(m_paneWindow);
Destroy();
}
}
void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
{
if (!m_solid_drag)
if (!m_solidDrag)
{
// systems without solid window dragging need to be
// handled slightly differently, due to the lack of
@@ -204,70 +204,70 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
}
wxRect win_rect = GetRect();
wxRect winRect = GetRect();
if (win_rect == m_last_rect)
if (winRect == m_lastRect)
return;
// skip the first move event
if (m_last_rect.IsEmpty())
if (m_lastRect.IsEmpty())
{
m_last_rect = win_rect;
m_lastRect = winRect;
return;
}
// skip if moving too fast to avoid massive redraws and
// jumping hint windows
if ((abs(win_rect.x - m_last_rect.x) > 3) ||
(abs(win_rect.y - m_last_rect.y) > 3))
if ((abs(winRect.x - m_lastRect.x) > 3) ||
(abs(winRect.y - m_lastRect.y) > 3))
{
m_last3_rect = m_last2_rect;
m_last2_rect = m_last_rect;
m_last_rect = win_rect;
m_last3Rect = m_last2Rect;
m_last2Rect = m_lastRect;
m_lastRect = winRect;
// However still update the internally stored position to avoid
// snapping back to the old one later.
if (m_owner_mgr)
if (m_ownerMgr)
{
m_owner_mgr->GetPane(m_pane_window).
floating_pos = win_rect.GetPosition();
m_ownerMgr->GetPane(m_paneWindow).
floating_pos = winRect.GetPosition();
}
return;
}
// prevent frame redocking during resize
if (m_last_rect.GetSize() != win_rect.GetSize())
if (m_lastRect.GetSize() != winRect.GetSize())
{
m_last3_rect = m_last2_rect;
m_last2_rect = m_last_rect;
m_last_rect = win_rect;
m_last3Rect = m_last2Rect;
m_last2Rect = m_lastRect;
m_lastRect = winRect;
return;
}
wxDirection dir = wxALL;
int horiz_dist = abs(win_rect.x - m_last3_rect.x);
int vert_dist = abs(win_rect.y - m_last3_rect.y);
int horiz_dist = abs(winRect.x - m_last3Rect.x);
int vert_dist = abs(winRect.y - m_last3Rect.y);
if (vert_dist >= horiz_dist)
{
if (win_rect.y < m_last3_rect.y)
if (winRect.y < m_last3Rect.y)
dir = wxNORTH;
else
dir = wxSOUTH;
}
else
{
if (win_rect.x < m_last3_rect.x)
if (winRect.x < m_last3Rect.x)
dir = wxWEST;
else
dir = wxEAST;
}
m_last3_rect = m_last2_rect;
m_last2_rect = m_last_rect;
m_last_rect = win_rect;
m_last3Rect = m_last2Rect;
m_last2Rect = m_lastRect;
m_lastRect = winRect;
if (!isMouseDown())
return;
@@ -278,7 +278,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
m_moving = true;
}
if (m_last3_rect.IsEmpty())
if (m_last3Rect.IsEmpty())
return;
OnMoving(event.GetRect(), dir);
@@ -303,18 +303,18 @@ void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event)
void wxAuiFloatingFrame::OnMoveStart()
{
// notify the owner manager that the pane has started to move
if (m_owner_mgr)
if (m_ownerMgr)
{
m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window);
m_ownerMgr->OnFloatingPaneMoveStart(m_paneWindow);
}
}
void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir)
{
// notify the owner manager that the pane is moving
if (m_owner_mgr)
if (m_ownerMgr)
{
m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir);
m_ownerMgr->OnFloatingPaneMoving(m_paneWindow, dir);
}
m_lastDirection = dir;
}
@@ -322,17 +322,17 @@ void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirecti
void wxAuiFloatingFrame::OnMoveFinished()
{
// notify the owner manager that the pane has finished moving
if (m_owner_mgr)
if (m_ownerMgr)
{
m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection);
m_ownerMgr->OnFloatingPaneMoved(m_paneWindow, m_lastDirection);
}
}
void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event)
{
if (m_owner_mgr && event.GetActive())
if (m_ownerMgr && event.GetActive())
{
m_owner_mgr->OnFloatingPaneActivated(m_pane_window);
m_ownerMgr->OnFloatingPaneActivated(m_paneWindow);
}
}