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

Since wxPanel is now AutoLayout aware, removed indirect auto layouting

Browse Source 
of child windows from wxNotebook and wxSplitter, as per Robert's
request.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-10-20 18:30:47 +00:00
parent 50073cf24c
commit a6aa9b1ee8
5 changed files with 58 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/splitter.cpp
View File

@@ -185,7 +185,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
{
DrawSashTracker(x, y);
}
m_oldX = x;
m_oldY = y;
return;
@@ -279,7 +279,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
}
#endif // __WXGTK__
}
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
{
// Obtain window size. We are only interested in the dimension the sash
// splits up
@@ -433,7 +433,7 @@ void wxSplitterWindow::DrawBorders(wxDC& dc)
if ( GetWindowStyleFlag() & wxSP_3D )
{
dc.SetPen(*m_facePen);
dc.SetBrush(*m_faceBrush);
dc.DrawRectangle(1, 1 , w-1, m_borderSize-2 ); //high
@@ -618,9 +618,7 @@ void wxSplitterWindow::SizeWindows()
if ( m_windowOne && !m_windowTwo )
{
m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);
if (m_windowOne->GetAutoLayout())
m_windowOne->Layout();
}
else if ( m_windowOne && m_windowTwo )
{
@@ -638,11 +636,7 @@ void wxSplitterWindow::SizeWindows()
m_windowOne->SetSize(x1, y1, w1, h1);
m_windowTwo->SetSize(x2, y2, w2, h2);
if (m_windowOne->GetAutoLayout())
m_windowOne->Layout();
if (m_windowTwo->GetAutoLayout())
m_windowTwo->Layout();
}
else
{
@@ -650,11 +644,7 @@ void wxSplitterWindow::SizeWindows()
w - 2*m_borderSize, m_sashPosition - m_borderSize);
m_windowTwo->SetSize(m_borderSize, m_sashPosition + m_sashSize,
w - 2*m_borderSize, h - 2*m_borderSize - m_sashSize - (m_sashPosition - m_borderSize));
if (m_windowOne->GetAutoLayout())
m_windowOne->Layout();
if (m_windowTwo->GetAutoLayout())
m_windowTwo->Layout();
}
}
wxClientDC dc(this);