Include wx/image.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp
index b2dba2135d7b7919da99a4da176a3b9415de534c..5bb50e0518eae68324a1ce1fa6bf3d62908745b4 100644 (file)
--- a/src/mac/classic/statbrma.cpp
+++ b/src/mac/classic/statbrma.cpp
@@ -1,32 +1,34 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        statbar.cpp
+// Name:        src/mac/classic/statbar.cpp

 // Purpose:     native implementation of wxStatusBar (optional)
 // Author:      Stefan Csomor
 // Purpose:     native implementation of wxStatusBar (optional)
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbrma.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/statusbr.h"
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/statusbr.h"

-#include "wx/dc.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+#endif

 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
     EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
 #ifdef __WXMAC__
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
     EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
 #ifdef __WXMAC__

-#include "wx/mac/private.h"
+    #include "wx/mac/private.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -56,28 +58,28 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;

-    
+

     wxRect rect;
     GetFieldRect(i, rect);
     wxRect rect;
     GetFieldRect(i, rect);

-    
+

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

-    
+

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

-    
+

     long x, y;
     long x, y;

-    
+

     dc.GetTextExtent(text, &x, &y);
     dc.GetTextExtent(text, &x, &y);

-    
+

     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;

-    
+

     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);

-    
+

     dc.DrawText(text, xpos, ypos);
     dc.DrawText(text, xpos, ypos);

-    
+

     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 


@@ -89,67 +91,67 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
 void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
 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);
     rect.y=0;
     rect.height = m_height ;
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
     rect.y=0;
     rect.height = m_height ;

-    Refresh( TRUE , &rect ) ;
+    Refresh( true , &rect ) ;

     Update();
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
     Update();
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {

-       wxPaintDC dc(this);
-       dc.Clear() ;
+    wxPaintDC dc(this);
+    dc.Clear() ;

 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 
 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 

-       if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-       {
-               wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        if (major >= 10) 
+    if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+    {
+        wxPen white( wxWHITE , 1 , wxSOLID ) ;
+        if (major >= 10)

         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)

-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));

         }
         else
         {
             wxPen black( wxBLACK , 1 , wxSOLID ) ;
             dc.SetPen(black);
         }
         else
         {
             wxPen black( wxBLACK , 1 , wxSOLID ) ;
             dc.SetPen(black);

-       }
-               dc.DrawLine(0, 0 ,
-                      m_width , 0);
-               dc.SetPen(white);
-               dc.DrawLine(0, 1 ,
-                      m_width , 1);
-       }
-       else
-       {
-        if (major >= 10) 
+        }
+        dc.DrawLine(0, 0 ,
+                    m_width , 0);
+        dc.SetPen(white);
+        dc.DrawLine(0, 1 ,
+        m_width , 1);
+    }
+    else
+    {
+        if (major >= 10)

             //Finder statusbar border color: (Project builder similar is 9B9B9B)
             //Finder statusbar border color: (Project builder similar is 9B9B9B)

-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID)); 
+            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));

         else
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 
         else
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 

-               dc.DrawLine(0, 0 ,
-                      m_width , 0);
-       }
+        dc.DrawLine(0, 0 ,
+               m_width , 0);
+    }

 
 

-       int i;
-       if ( GetFont().Ok() )
-               dc.SetFont(GetFont());
-       dc.SetBackgroundMode(wxTRANSPARENT);
+    int i;
+    if ( GetFont().Ok() )
+        dc.SetFont(GetFont());
+    dc.SetBackgroundMode(wxTRANSPARENT);

 
 

-       for ( i = 0; i < m_nFields; i ++ )
-               DrawField(dc, i);
+    for ( i = 0; i < m_nFields; i ++ )
+        DrawField(dc, i);

 }
 
 }
 

-void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+void wxStatusBarMac::MacSuperEnabled( bool enabled )

 {
 {

-    Refresh(FALSE) ;
+    Refresh(false) ;

     wxWindow::MacSuperEnabled( enabled ) ;
 }
     wxWindow::MacSuperEnabled( enabled ) ;
 }