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

don't explicitly set font and bg colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-19 22:39:05 +00:00
parent 0c2a5de2b1
commit 1ca21594f7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/generic/statusbr.h
View File

@@ -115,7 +115,6 @@ protected:
int m_borderX; int m_borderX;
int m_borderY; int m_borderY;
wxFont m_defaultStatusBarFont;
wxPen m_mediumShadowPen; wxPen m_mediumShadowPen;
wxPen m_hilightPen; wxPen m_hilightPen;

10
src/generic/statusbr.cpp
View File

@@ -91,7 +91,9 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
#endif #endif
InitColours(); InitColours();
SetFont(m_defaultStatusBarFont); #ifdef __WXPM__
SetFont(*wxSMALL_FONT);
#endif
// Set the height according to the font and the border size // Set the height according to the font and the border size
wxClientDC dc(this); wxClientDC dc(this);
@@ -368,16 +370,10 @@ void wxStatusBarGeneric::InitColours()
SetBackgroundColour(vColour); SetBackgroundColour(vColour);
vColour.Set(wxString("BLACK")); vColour.Set(wxString("BLACK"));
SetForegroundColour(vColour); SetForegroundColour(vColour);
m_defaultStatusBarFont = *wxSMALL_FONT;
#else #else
m_mediumShadowPen = wxPen("GREY", 1, wxSOLID); m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
m_hilightPen = wxPen("WHITE", 1, wxSOLID); m_hilightPen = wxPen("WHITE", 1, wxSOLID);
#endif #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. // Responds to colour changes, and passes event on to children.