crash upon hide fix

[wxWidgets.git] / src / mac / statbrma.cpp

diff --git a/src/mac/statbrma.cpp b/src/mac/statbrma.cpp
index d3c0e102dd65d078f74d1599f90944df4bb70547..c06702058d8b1b63efee4cf9351c3320decc0b49 100644 (file)
--- a/src/mac/statbrma.cpp
+++ b/src/mac/statbrma.cpp
@@ -10,30 +10,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "statusbr.h"
+#pragma implementation "statbrma.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/mac/statusbr.h"
-
-#if     !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBarMac, wxStatusBarGeneric);
+#include "wx/statusbr.h"
+#include "wx/dc.h"
+#include "wx/dcclient.h"
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
        EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
-#endif  //USE_SHARED_LIBRARY
 
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// wxStatusBarXX class
+// wxStatusBarMac class
 // ----------------------------------------------------------------------------
 
 wxStatusBarMac::wxStatusBarMac()
@@ -58,6 +59,11 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 
   wxRect rect;
   GetFieldRect(i, rect);
+  
+  if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+  {
+    dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+  }
 
   wxString text(GetStatusText(i));
 
@@ -80,29 +86,54 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
     DrawFieldText(dc, i);
 }
 
+void wxStatusBarMac::SetStatusText(const wxString& text, int number)
+{
+    wxCHECK_RET( (number >= 0) && (number < m_nFields),
+                 _T("invalid status bar field index") );
+
+    m_statusStrings[number] = text;
+    wxRect rect;
+    GetFieldRect(number, rect);
+    rect.y=0;
+    rect.height = m_height ;
+    Refresh( TRUE , &rect ) ;
+}
+
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
        wxPaintDC dc(this);
-       wxPen black( wxBLACK , 1 , wxSOLID ) ;
-       wxPen white( wxWHITE , 1 , wxSOLID ) ;
-       
-    dc.SetPen(black);
-    dc.DrawLine(0, 0 ,
-           m_width , 0);
-       dc.SetPen(white);
-    dc.DrawLine(0, 1 ,
-           m_width , 1);
-
-
-  int i;
-  if ( GetFont().Ok() )
-    dc.SetFont(GetFont());
-  dc.SetBackgroundMode(wxTRANSPARENT);
-
-  for ( i = 0; i < m_nFields; i ++ )
-    DrawField(dc, i);
-
-#   ifdef __WXMSW__
-        dc.SetFont(wxNullFont);
-#   endif // MSW
-}
\ No newline at end of file
+       dc.Clear() ;
+
+       if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+       {
+               wxPen black( wxBLACK , 1 , wxSOLID ) ;
+               wxPen white( wxWHITE , 1 , wxSOLID ) ;
+
+               dc.SetPen(black);
+               dc.DrawLine(0, 0 ,
+                      m_width , 0);
+               dc.SetPen(white);
+               dc.DrawLine(0, 1 ,
+                      m_width , 1);
+       }
+       else
+       {
+               dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
+               dc.DrawLine(0, 0 ,
+                      m_width , 0);
+       }
+
+       int i;
+       if ( GetFont().Ok() )
+               dc.SetFont(GetFont());
+       dc.SetBackgroundMode(wxTRANSPARENT);
+
+       for ( i = 0; i < m_nFields; i ++ )
+               DrawField(dc, i);
+}
+
+void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+{
+    Refresh(FALSE) ;
+    wxWindow::MacSuperEnabled( enabled ) ;
+}