AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-02-05 07:15:26 +00:00
parent 8e729eb44b
commit 61fa2e39da
1 changed files with 69 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/mac/carbon/statbrma.cpp
View File

@ -1,44 +1,32 @@
///////////////////////////////////////////////////////////////////////////////
// Name: statbar.cpp
// Name: src/mac/carbon/statbarma.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
///////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/wxprec.h"
#include "wx/statusbr.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/mac/private.h"
#include "wx/toplevel.h"
BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
EVT_PAINT(wxStatusBarMac::OnPaint)
END_EVENT_TABLE()
#ifdef __WXMAC__
#include "wx/mac/private.h"
#include "wx/toplevel.h"
#endif
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// wxStatusBarMac class
// ----------------------------------------------------------------------------
wxStatusBarMac::wxStatusBarMac()
{
SetParent(NULL);
SetParent( NULL );
}
wxStatusBarMac::~wxStatusBarMac()
@ -49,16 +37,16 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
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() )
MacSetBackgroundBrush( wxNullBrush ) ;
MacSetBackgroundBrush( wxNullBrush );
// 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)
@ -68,28 +56,26 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
GetSize( &w , &h ) ;
wxRect rect;
GetFieldRect(i, rect);
if ( !MacIsReallyHilited() )
{
if ( !MacIsReallyHilited() )
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 ;
if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
ypos++ ;
dc.SetClippingRegion(rect.x, 0, rect.width, h);
dc.DrawText(text, xpos, ypos);
dc.DestroyClippingRegion();
}
@ -101,77 +87,75 @@ 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") );
wxT("invalid status bar field index") );
if ( m_statusStrings[number] == text )
return ;
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;
rect.height = h ;
Refresh( TRUE , &rect ) ;
Refresh( true, &rect );
Update();
}
void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
dc.Clear() ;
wxPaintDC dc(this);
dc.Clear();
int major,minor;
int 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() )
dc.SetPen(wxPen(wxColour(0x40,40,40) ,1,wxSOLID)) ;
dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxSOLID));
else
dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID));
}
else
{
wxPen black( *wxBLACK , 1 , wxSOLID ) ;
wxPen black( *wxBLACK , 1 , wxSOLID );
dc.SetPen(black);
}
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));
else
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()
{
Refresh() ;
Update() ;
Refresh();
Update();
}