Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/src/mac/statbrma.cpp b/src/mac/statbrma.cpp
index d3fef290a39031c7b878e10fa0527a39f956a20b..e39e83bb81765060a4d7f16e22c331cd556ca547 100644 (file)
--- a/src/mac/statbrma.cpp
+++ b/src/mac/statbrma.cpp
@@ -22,7 +22,7 @@
 #include "wx/dcclient.h"
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
-       EVT_PAINT(wxStatusBarMac::OnPaint)
+    EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
 #ifdef __WXMAC__
@@ -47,38 +47,38 @@ wxStatusBarMac::~wxStatusBarMac()
 }
 
 bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
-           long style ,
-           const wxString& name)
+                            long style ,
+                            const wxString& name)
 {
-       return wxStatusBarGeneric::Create( parent , id , style , name ) ;
+    return wxStatusBarGeneric::Create( parent , id , style , name ) ;
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
-  int leftMargin = 2;
-
-  wxRect rect;
-  GetFieldRect(i, rect);
-  
-  if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-  {
-    dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
-  }
-
-  wxString text(GetStatusText(i));
-
-  long x, y;
-
-  dc.GetTextExtent(text, &x, &y);
-
-  int xpos = rect.x + leftMargin + 1 ;
-  int ypos = 2 ;
-  
-  dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
-
-  dc.DrawText(text, xpos, ypos);
-
-  dc.DestroyClippingRegion();
+    int leftMargin = 2;
+    
+    wxRect rect;
+    GetFieldRect(i, rect);
+    
+    if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+    {
+        dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+    }
+    
+    wxString text(GetStatusText(i));
+    
+    long x, y;
+    
+    dc.GetTextExtent(text, &x, &y);
+    
+    int xpos = rect.x + leftMargin + 1 ;
+    int ypos = 2 ;
+    
+    dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
+    
+    dc.DrawText(text, xpos, ypos);
+    
+    dc.DestroyClippingRegion();
 }
 
 void wxStatusBarMac::DrawField(wxDC& dc, int i)
@@ -89,8 +89,8 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
 void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
-                 _T("invalid status bar field index") );
-
+        _T("invalid status bar field index") );
+    
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
@@ -101,35 +101,35 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-       wxPaintDC dc(this);
-       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);
+    wxPaintDC dc(this);
+    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 )