X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2646f485163f410baaad5bcf49028c604a352d19..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/classic/statbrma.cpp?ds=sidebyside diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp index b2dba2135d..5bb50e0518 100644 --- 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 -// Modified by: +// Modified by: // 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" -#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__ -#include "wx/mac/private.h" + #include "wx/mac/private.h" #endif // ============================================================================ @@ -56,28 +58,28 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id, 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 = 1 ; - + dc.SetClippingRegion(rect.x, 0, rect.width, m_height); - + dc.DrawText(text, xpos, ypos); - + 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), - _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 ; - Refresh( TRUE , &rect ) ; + Refresh( true , &rect ) ; Update(); } void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) ) { - wxPaintDC dc(this); - dc.Clear() ; + wxPaintDC dc(this); + dc.Clear() ; 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) - 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); - } - 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) - 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)); - 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 ) ; }