Updated font dialog constructors to use a reference to the font data

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index d3c0e102dd65d078f74d1599f90944df4bb70547..59f6573dae2c7f385145378cdaffdeb415541377 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -10,30 +10,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "statusbr.h"
+#pragma implementation "statbrma.h"

 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #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()
 
 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
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxStatusBarXX class
+// wxStatusBarMac class

 // ----------------------------------------------------------------------------
 
 wxStatusBarMac::wxStatusBarMac()
 // ----------------------------------------------------------------------------
 
 wxStatusBarMac::wxStatusBarMac()


@@ -58,6 +59,11 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 
   wxRect rect;
   GetFieldRect(i, rect);
 
   wxRect rect;
   GetFieldRect(i, rect);

+  
+  if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+  {
+    dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+  }

 
   wxString text(GetStatusText(i));
 
 
   wxString text(GetStatusText(i));
 


@@ -80,10 +86,34 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
     DrawFieldText(dc, 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);
+    Refresh( TRUE , &rect ) ;
+    /*
+    // TODO make clear work again also when using themes
+    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 );
+    */
+
+}
+

 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
        wxPaintDC dc(this);
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
        wxPaintDC dc(this);

-       wxPen black( wxBLACK , 1 , wxSOLID ) ;
+       
+  if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+  {
+       wxPen black( wxBLACK , 1 , wxSOLID ) ;

        wxPen white( wxWHITE , 1 , wxSOLID ) ;
        
     dc.SetPen(black);
        wxPen white( wxWHITE , 1 , wxSOLID ) ;
        
     dc.SetPen(black);


@@ -92,7 +122,13 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
        dc.SetPen(white);
     dc.DrawLine(0, 1 ,
            m_width , 1);
        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() )
 
   int i;
   if ( GetFont().Ok() )


@@ -105,4 +141,10 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 #   ifdef __WXMSW__
         dc.SetFont(wxNullFont);
 #   endif // MSW
 #   ifdef __WXMSW__
         dc.SetFont(wxNullFont);
 #   endif // MSW

-}
\ No newline at end of file
+}
+
+void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+{
+    Refresh(FALSE) ;
+    wxWindow::MacSuperEnabled( enabled ) ;
+}