From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 9 Feb 2003 09:01:05 +0000 (+0000)
Subject: redraw changes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6dbc7fb4e5865133659c194d73f34e91bbe7e8d0

redraw changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 59f6573dae..c06702058d 100644
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -94,53 +94,42 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
+    rect.y=0;
+    rect.height = m_height ;
     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) )
 {
   	wxPaintDC dc(this);
-  	
-  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 ( GetFont().Ok() )
-    dc.SetFont(GetFont());
-  dc.SetBackgroundMode(wxTRANSPARENT);
-
-  for ( i = 0; i < m_nFields; i ++ )
-    DrawField(dc, i);
-
-#   ifdef __WXMSW__
-        dc.SetFont(wxNullFont);
-#   endif // MSW
+  	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 ( GetFont().Ok() )
+		dc.SetFont(GetFont());
+	dc.SetBackgroundMode(wxTRANSPARENT);
+
+	for ( i = 0; i < m_nFields; i ++ )
+		DrawField(dc, i);
 }
 
 void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
diff --git a/src/mac/statbrma.cpp b/src/mac/statbrma.cpp
index 59f6573dae..c06702058d 100644
--- a/src/mac/statbrma.cpp
+++ b/src/mac/statbrma.cpp
@@ -94,53 +94,42 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
+    rect.y=0;
+    rect.height = m_height ;
     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) )
 {
   	wxPaintDC dc(this);
-  	
-  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 ( GetFont().Ok() )
-    dc.SetFont(GetFont());
-  dc.SetBackgroundMode(wxTRANSPARENT);
-
-  for ( i = 0; i < m_nFields; i ++ )
-    DrawField(dc, i);
-
-#   ifdef __WXMSW__
-        dc.SetFont(wxNullFont);
-#   endif // MSW
+  	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 ( GetFont().Ok() )
+		dc.SetFont(GetFont());
+	dc.SetBackgroundMode(wxTRANSPARENT);
+
+	for ( i = 0; i < m_nFields; i ++ )
+		DrawField(dc, i);
 }
 
 void wxStatusBarMac::MacSuperEnabled( bool enabled )