corrected wxMacSetColorTableEntry (although it is not needed currently)

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index fa7a9f0690346de7f07b2628f90c018f75aef7bf..2256846c67a104f31c84c4a5d891590bc3a7ee84 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -85,6 +85,9 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
                                   wxDefaultPosition, wxDefaultSize,
                                   style | wxTAB_TRAVERSAL, name);
 
+  // The status bar should have a themed background
+  SetThemeEnabled( TRUE );
+
   // Don't wish this to be found as a child
 #ifndef __WXMAC__
   parent->GetChildren().DeleteObject(this);
@@ -127,27 +130,10 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
 
     m_statusStrings[number] = text;
 
-#ifdef __WXMAC__
-    int major,minor;
-    wxGetOsVersion( &major, &minor );
-    
-    if (major >= 10)
-    {
-        Refresh();
-        return;
-    }
-#endif
-
     wxRect rect;
     GetFieldRect(number, rect);
-    wxClientDC dc(this);
-
-    dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
-    dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
-    dc.Clear();
-    dc.DestroyClippingRegion();
-
-    DrawFieldText( dc, number );
+    
+    Refresh( TRUE, &rect );
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const
@@ -210,7 +196,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 #ifdef __WXPM__
   wxColour                          vColor;
 
-  vColor.InitFromName("GREY");
+  vColor.InitFromName("LIGHT GREY");
   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 
@@ -386,15 +372,25 @@ void wxStatusBarGeneric::InitColours()
     wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)
-    m_mediumShadowPen = wxPen("LIGHT GREY", 1, wxSOLID);
+    m_mediumShadowPen = wxPen("DARK GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
+
+    wxColour                        vColour;
+
+    vColour.Set(wxString("LIGHT GREY"));
+    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.