git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37312
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
+// Name: src/mac/carbon/statbarma.cpp
// Purpose: native implementation of wxStatusBar (optional)
// Author: Stefan Csomor
// Purpose: native implementation of wxStatusBar (optional)
// Author: Stefan Csomor
// 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
///////////////////////////////////////////////////////////////////////////////
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
#include "wx/wxprec.h"
#include "wx/statusbr.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/wxprec.h"
#include "wx/statusbr.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
-BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
- EVT_PAINT(wxStatusBarMac::OnPaint)
-END_EVENT_TABLE()
-
-#ifdef __WXMAC__
#include "wx/mac/private.h"
#include "wx/toplevel.h"
#include "wx/mac/private.h"
#include "wx/toplevel.h"
-// ============================================================================
-// implementation
-// ============================================================================
-// ----------------------------------------------------------------------------
-// wxStatusBarMac class
-// ----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
+ EVT_PAINT(wxStatusBarMac::OnPaint)
+END_EVENT_TABLE()
+
wxStatusBarMac::wxStatusBarMac()
{
wxStatusBarMac::wxStatusBarMac()
{
}
wxStatusBarMac::~wxStatusBarMac()
}
wxStatusBarMac::~wxStatusBarMac()
long style ,
const wxString& name)
{
long style ,
const wxString& name)
{
- if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
- return FALSE ;
-
+ if ( !wxStatusBarGeneric::Create( parent , id , style , name ) )
+ return false;
+
if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
- MacSetBackgroundBrush( wxNullBrush ) ;
-
+ MacSetBackgroundBrush( wxNullBrush );
+
// normal system font is too tall for fitting into the standard height
// normal system font is too tall for fitting into the standard height
- SetWindowVariant( wxWINDOW_VARIANT_SMALL ) ;
-
- return TRUE ;
+ SetWindowVariant( wxWINDOW_VARIANT_SMALL );
+
+ return true ;
}
void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
}
void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
GetSize( &w , &h ) ;
wxRect rect;
GetFieldRect(i, rect);
GetSize( &w , &h ) ;
wxRect rect;
GetFieldRect(i, rect);
-
- if ( !MacIsReallyHilited() )
- {
+
+ if ( !MacIsReallyHilited() )
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
wxString text(GetStatusText(i));
wxString text(GetStatusText(i));
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 ;
-
- if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
+
+ if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
dc.SetClippingRegion(rect.x, 0, rect.width, h);
dc.SetClippingRegion(rect.x, 0, rect.width, h);
dc.DrawText(text, xpos, ypos);
dc.DrawText(text, xpos, ypos);
dc.DestroyClippingRegion();
}
dc.DestroyClippingRegion();
}
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") );
-
+ wxT("invalid status bar field index") );
+
if ( m_statusStrings[number] == text )
return ;
if ( m_statusStrings[number] == text )
return ;
m_statusStrings[number] = text;
wxRect rect;
GetFieldRect(number, rect);
m_statusStrings[number] = text;
wxRect rect;
GetFieldRect(number, rect);
- int w, h ;
- GetSize( &w , &h ) ;
- rect.y=0;
+ int w, h;
+ GetSize( &w, &h );
+ rect.y = 0;
- Refresh( TRUE , &rect ) ;
+ Refresh( true, &rect );
-void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
+void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
- wxPaintDC dc(this);
- dc.Clear() ;
+ wxPaintDC dc(this);
+ dc.Clear();
wxGetOsVersion( &major, &minor );
wxGetOsVersion( &major, &minor );
- int w, h ;
- GetSize( &w , &h ) ;
+ int w, h;
+ GetSize( &w, &h );
- if ( MacIsReallyHilited() )
- {
- wxPen white( *wxWHITE , 1 , wxSOLID ) ;
- if (major >= 10 )
+ if ( MacIsReallyHilited() )
+ {
+ 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)
if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
- dc.SetPen(wxPen(wxColour(0x40,40,40) ,1,wxSOLID)) ;
+ dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxSOLID));
- dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
+ dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID));
- wxPen black( *wxBLACK , 1 , wxSOLID ) ;
+ wxPen black( *wxBLACK , 1 , wxSOLID );
- }
- dc.DrawLine(0, 0 ,
- w , 0);
- dc.SetPen(white);
- dc.DrawLine(0, 1 ,
- w , 1);
- }
- else
- {
- if (major >= 10)
- //Finder statusbar border color: (Project builder similar is 9B9B9B)
- dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
+ }
+
+ dc.DrawLine(0, 0, w, 0);
+ dc.SetPen(white);
+ dc.DrawLine(0, 1, w, 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(0x80,0x80,0x80),1,wxSOLID));
+ dc.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxSOLID));
- dc.DrawLine(0, 0 ,
- w , 0);
- }
+ dc.DrawLine(0, 0, w, 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::MacHiliteChanged()
{
}
void wxStatusBarMac::MacHiliteChanged()
{
- Refresh() ;
- Update() ;