Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove OS X statusbar code targeting MacOS.

Browse Source
This commit is contained in:
Tobias Taschner
2016-03-04 14:17:41 +01:00
parent da7388c9c8
commit 54cbd22ded
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osx/carbon/statbrma.cpp
View File

@@ -125,27 +125,17 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
wxPaintDC dc(this);
dc.Clear();
int major, minor;
wxGetOsVersion( &major, &minor );
int w, h;
GetSize( &w, &h );
if ( MacIsReallyHilited() )
{
wxPen white( *wxWHITE , 1 , wxPENSTYLE_SOLID );
if (major >= 10)
{
// Finder statusbar border color: (Project Builder similar is 9B9B9B)
if ( MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL )
dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxPENSTYLE_SOLID));
else
dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
}
// Finder statusbar border color: (Project Builder similar is 9B9B9B)
if ( MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL )
dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxPENSTYLE_SOLID));
else
{
wxPen black( *wxBLACK , 1 , wxPENSTYLE_SOLID );
dc.SetPen(black);
}
dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
dc.DrawLine(0, 0, w, 0);
dc.SetPen(white);
@@ -153,11 +143,8 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
}
else
{
if (major >= 10)
// Finder statusbar border color: (Project Builder similar is 9B9B9B)
dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
else
dc.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxPENSTYLE_SOLID));
// Finder statusbar border color: (Project Builder similar is 9B9B9B)
dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
dc.DrawLine(0, 0, w, 0);
}