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

fix for (re)positioning the main window when the style changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-26 16:19:27 +00:00
parent 69c916e921
commit a95cdab85c
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/generic/listctrl.cpp
View File

@ -4378,36 +4378,35 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
{ {
m_mainWin->DeleteEverything(); m_mainWin->DeleteEverything();
int width = 0; // has the header visibility changed?
int height = 0; bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
GetClientSize( &width, &height ); willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
if (flag & wxLC_REPORT) if ( hasHeader != willHaveHeader )
{ {
if (!HasFlag(wxLC_REPORT)) // toggle it
if ( hasHeader )
{
if ( m_headerWin )
{
// don't delete, just hide, as we can reuse it later
m_headerWin->Show(FALSE);
}
//else: nothing to do
}
else // must show header
{ {
if (!m_headerWin) if (!m_headerWin)
{ {
CreateHeaderWindow(); CreateHeaderWindow();
if (HasFlag(wxLC_NO_HEADER))
m_headerWin->Show( FALSE );
} }
else else // already have it, just show
{ {
if (flag & wxLC_NO_HEADER) m_headerWin->Show( TRUE );
m_headerWin->Show( FALSE );
else
m_headerWin->Show( TRUE );
} }
} }
}
else // !report ResizeReportView(willHaveHeader);
{
if ( m_mainWin->HasHeader() )
{
m_headerWin->Show( FALSE );
}
} }
} }
@ -4798,10 +4797,17 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
if ( !m_mainWin ) if ( !m_mainWin )
return; return;
ResizeReportView(m_mainWin->HasHeader());
m_mainWin->RecalculatePositions();
}
void wxListCtrl::ResizeReportView(bool showHeader)
{
int cw, ch; int cw, ch;
GetClientSize( &cw, &ch ); GetClientSize( &cw, &ch );
if ( m_mainWin->HasHeader() ) if ( showHeader )
{ {
m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT ); m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 ); m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );
@ -4810,8 +4816,6 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
{ {
m_mainWin->SetSize( 0, 0, cw, ch ); m_mainWin->SetSize( 0, 0, cw, ch );
} }
m_mainWin->RecalculatePositions();
} }
void wxListCtrl::OnIdle( wxIdleEvent & event ) void wxListCtrl::OnIdle( wxIdleEvent & event )