restored "#ifdef __WXMSW__" around SetFont(wxNullFont) - this leads to SIGSEGV
under wxGTK! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -62,9 +62,9 @@ wxStatusBar::wxStatusBar(void)
|
|||||||
|
|
||||||
wxStatusBar::~wxStatusBar(void)
|
wxStatusBar::~wxStatusBar(void)
|
||||||
{
|
{
|
||||||
// #ifdef __WXMSW__
|
# ifdef __WXMSW__
|
||||||
SetFont(wxNullFont);
|
SetFont(wxNullFont);
|
||||||
// #endif
|
# endif // MSW
|
||||||
|
|
||||||
if ( m_statusWidths )
|
if ( m_statusWidths )
|
||||||
delete[] m_statusWidths;
|
delete[] m_statusWidths;
|
||||||
@@ -179,7 +179,9 @@ void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) )
|
|||||||
for ( i = 0; i < m_nFields; i ++ )
|
for ( i = 0; i < m_nFields; i ++ )
|
||||||
DrawField(dc, i);
|
DrawField(dc, i);
|
||||||
|
|
||||||
|
# ifdef __WXMSW__
|
||||||
dc.SetFont(wxNullFont);
|
dc.SetFont(wxNullFont);
|
||||||
|
# endif // MSW
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxStatusBar::DrawFieldText(wxDC& dc, int i)
|
void wxStatusBar::DrawFieldText(wxDC& dc, int i)
|
||||||
|
|||||||
Reference in New Issue
Block a user