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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 8a73ac8bf8d441268924a29bc68aa32cb157d94a..63ed0802c36d6e398427aa0874345ea3d2474020 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -115,7 +115,6 @@ protected:
 
   int               m_borderX;
   int               m_borderY;
 
   int               m_borderX;
   int               m_borderY;

-  wxFont            m_defaultStatusBarFont;

   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 
   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 7916ca4434a469263aeca1aade629d3e536fce26..da2df835a7327236b16f8079c16835e65cb19c91 100644 (file)
--- 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();
   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);
 
   // 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);
     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
 #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.
 }
 
 // Responds to colour changes, and passes event on to children.