From ef7c5bd22aecd50c2dacd21cd2f12652309d8254 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 1 Jul 2001 20:57:09 +0000 Subject: [PATCH] refresh during window delete (if root window deleted) removed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/listctrl.cpp | 6 +++--- src/mac/carbon/window.cpp | 12 +++++++++++- src/mac/window.cpp | 12 +++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 38985b43ff..6d25185ea9 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -1719,7 +1719,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { m_lines[i].Draw( &dc ); // Draw horizontal rule if required - if (GetWindowStyle() & wxLC_HRULES) + if (m_mode & wxLC_HRULES) { dc.SetPen(pen); dc.SetBrush(* wxTRANSPARENT_BRUSH); @@ -1728,7 +1728,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } // Draw last horizontal rule - if ((i > (size_t) (y_s / lineSpacing)) && (GetWindowStyle() & wxLC_HRULES)) + if ((i > (size_t) (y_s / lineSpacing)) && (m_mode & wxLC_HRULES)) { dc.SetPen(pen); dc.SetBrush(* wxTRANSPARENT_BRUSH); @@ -1736,7 +1736,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } // Draw vertical rules if required - if ((GetWindowStyle() & wxLC_VRULES) && (GetItemCount() > 0)) + if ((m_mode & wxLC_VRULES) && (GetItemCount() > 0)) { int col = 0; wxRect firstItemRect; diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 62f65318ea..edc7d866a8 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -775,7 +775,17 @@ bool wxWindow::Show(bool show) } } MacSuperShown( show ) ; - Refresh() ; + if ( !show ) + { + WindowRef window = GetMacRootWindow() ; + wxWindow* win = wxFindWinFromMacWindow( window ) ; + if ( !win->m_isBeingDeleted ) + Refresh() ; + } + else + { + Refresh() ; + } return TRUE; } diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 62f65318ea..edc7d866a8 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -775,7 +775,17 @@ bool wxWindow::Show(bool show) } } MacSuperShown( show ) ; - Refresh() ; + if ( !show ) + { + WindowRef window = GetMacRootWindow() ; + wxWindow* win = wxFindWinFromMacWindow( window ) ; + if ( !win->m_isBeingDeleted ) + Refresh() ; + } + else + { + Refresh() ; + } return TRUE; } -- 2.45.2