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

redraw changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-02-09 09:01:05 +00:00
parent 81b41c03c6
commit 6dbc7fb4e5
2 changed files with 54 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,53 +94,42 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
m_statusStrings[number] = text; m_statusStrings[number] = text;
wxRect rect; wxRect rect;
GetFieldRect(number, rect); GetFieldRect(number, rect);
rect.y=0;
rect.height = m_height ;
Refresh( TRUE , &rect ) ; Refresh( TRUE , &rect ) ;
/*
// TODO make clear work again also when using themes
wxClientDC dc(this);
dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
dc.Clear();
dc.DestroyClippingRegion();
DrawFieldText( dc, number );
*/
} }
void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) ) void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
{ {
wxPaintDC dc(this); wxPaintDC dc(this);
dc.Clear() ;
if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
{
wxPen black( wxBLACK , 1 , wxSOLID ) ;
wxPen white( wxWHITE , 1 , wxSOLID ) ;
dc.SetPen(black);
dc.DrawLine(0, 0 ,
m_width , 0);
dc.SetPen(white);
dc.DrawLine(0, 1 ,
m_width , 1);
}
else
{
dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
dc.DrawLine(0, 0 ,
m_width , 0);
}
int i; if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
if ( GetFont().Ok() ) {
dc.SetFont(GetFont()); wxPen black( wxBLACK , 1 , wxSOLID ) ;
dc.SetBackgroundMode(wxTRANSPARENT); wxPen white( wxWHITE , 1 , wxSOLID ) ;
for ( i = 0; i < m_nFields; i ++ ) dc.SetPen(black);
DrawField(dc, i); dc.DrawLine(0, 0 ,
m_width , 0);
dc.SetPen(white);
dc.DrawLine(0, 1 ,
m_width , 1);
}
else
{
dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
dc.DrawLine(0, 0 ,
m_width , 0);
}
# ifdef __WXMSW__ int i;
dc.SetFont(wxNullFont); if ( GetFont().Ok() )
# endif // MSW dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT);
for ( i = 0; i < m_nFields; i ++ )
DrawField(dc, i);
} }
void wxStatusBarMac::MacSuperEnabled( bool enabled ) void wxStatusBarMac::MacSuperEnabled( bool enabled )

65
src/mac/statbrma.cpp
View File

@@ -94,53 +94,42 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
m_statusStrings[number] = text; m_statusStrings[number] = text;
wxRect rect; wxRect rect;
GetFieldRect(number, rect); GetFieldRect(number, rect);
rect.y=0;
rect.height = m_height ;
Refresh( TRUE , &rect ) ; Refresh( TRUE , &rect ) ;
/*
// TODO make clear work again also when using themes
wxClientDC dc(this);
dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
dc.Clear();
dc.DestroyClippingRegion();
DrawFieldText( dc, number );
*/
} }
void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) ) void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
{ {
wxPaintDC dc(this); wxPaintDC dc(this);
dc.Clear() ;
if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
{
wxPen black( wxBLACK , 1 , wxSOLID ) ;
wxPen white( wxWHITE , 1 , wxSOLID ) ;
dc.SetPen(black);
dc.DrawLine(0, 0 ,
m_width , 0);
dc.SetPen(white);
dc.DrawLine(0, 1 ,
m_width , 1);
}
else
{
dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
dc.DrawLine(0, 0 ,
m_width , 0);
}
int i; if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
if ( GetFont().Ok() ) {
dc.SetFont(GetFont()); wxPen black( wxBLACK , 1 , wxSOLID ) ;
dc.SetBackgroundMode(wxTRANSPARENT); wxPen white( wxWHITE , 1 , wxSOLID ) ;
for ( i = 0; i < m_nFields; i ++ ) dc.SetPen(black);
DrawField(dc, i); dc.DrawLine(0, 0 ,
m_width , 0);
dc.SetPen(white);
dc.DrawLine(0, 1 ,
m_width , 1);
}
else
{
dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
dc.DrawLine(0, 0 ,
m_width , 0);
}
# ifdef __WXMSW__ int i;
dc.SetFont(wxNullFont); if ( GetFont().Ok() )
# endif // MSW dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT);
for ( i = 0; i < m_nFields; i ++ )
DrawField(dc, i);
} }
void wxStatusBarMac::MacSuperEnabled( bool enabled ) void wxStatusBarMac::MacSuperEnabled( bool enabled )