From 1ca21594f7d0a28c4b3721088dbb0206b563bf8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 19 Jun 2004 22:39:05 +0000 Subject: [PATCH] don't explicitly set font and bg colour git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/statusbr.h | 1 - src/generic/statusbr.cpp | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index 8a73ac8bf8..63ed0802c3 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -115,7 +115,6 @@ protected: int m_borderX; int m_borderY; - wxFont m_defaultStatusBarFont; wxPen m_mediumShadowPen; wxPen m_hilightPen; diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 7916ca4434..da2df835a7 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -90,8 +90,10 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, parent->GetChildren().DeleteObject(this); #endif InitColours(); - - SetFont(m_defaultStatusBarFont); + +#ifdef __WXPM__ + SetFont(*wxSMALL_FONT); +#endif // Set the height according to the font and the border size wxClientDC dc(this); @@ -368,16 +370,10 @@ void wxStatusBarGeneric::InitColours() SetBackgroundColour(vColour); vColour.Set(wxString("BLACK")); SetForegroundColour(vColour); - m_defaultStatusBarFont = *wxSMALL_FONT; #else m_mediumShadowPen = wxPen("GREY", 1, wxSOLID); m_hilightPen = wxPen("WHITE", 1, wxSOLID); #endif - -#ifndef __WXPM__ - m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); -#endif } // Responds to colour changes, and passes event on to children. -- 2.45.2