X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/daa85e93c4c532ea2da44480a50f89fb697e1848..f5bed7a885024108682c32c74567cdf7bf2ed13b:/src/generic/statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 512db25f6d..bb1b36f560 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -13,15 +13,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STATUSBAR
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
-#include "wx/frame.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
 #endif
 
 #ifdef __WXGTK20__
@@ -29,8 +31,6 @@
 #include "wx/gtk/win_gtk.h"
 #endif
 
-#include "wx/statusbr.h"
-
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
 // standard wxStatusBar class, if wxStatusBarGeneric is the same as
 // wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in
@@ -358,17 +358,13 @@ void wxStatusBarGeneric::InitColours()
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)
     m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
-    m_hilightPen = wxPen(_T("WHITE"), 1, wxSOLID);
-
-    wxColour                        vColour;
+    m_hilightPen = *wxWHITE_PEN;
 
-    vColour.Set(wxString(_T("LIGHT GREY")));
-    SetBackgroundColour(vColour);
-    vColour.Set(wxString(_T("BLACK")));
-    SetForegroundColour(vColour);
+    SetBackgroundColour(*wxLIGHT_GREY);
+    SetForegroundColour(*wxBLACK);
 #else
-    m_mediumShadowPen = wxPen(_T("GREY"), 1, wxSOLID);
-    m_hilightPen = wxPen(_T("WHITE"), 1, wxSOLID);
+    m_mediumShadowPen = *wxGREY_PEN;
+    m_hilightPen = *wxWHITE_PEN;
 #endif
 }