From ab9e18400999d8be3ddc5a31892e4a09b2a17f85 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Wed, 3 Jan 2007 03:56:40 +0000
Subject: [PATCH] Removed some more superfluous Begin/EndDrawing

Originally committed to SVN as r690.
---
 aegisub/text_file_reader.cpp |  1 +
 aegisub/video_display.cpp    | 13 -------------
 aegisub/video_slider.cpp     |  4 ----
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/aegisub/text_file_reader.cpp b/aegisub/text_file_reader.cpp
index e5ffca8ca..a4f0279bc 100644
--- a/aegisub/text_file_reader.cpp
+++ b/aegisub/text_file_reader.cpp
@@ -208,6 +208,7 @@ wxString TextFileReader::ReadLineFromFile() {
 			buffer[511] = '\1';
 			if (fgets(buffer, 512, file)) {
 				// read succeeded
+				// FIXME, this might break on incomplete multibyte characters
 				wxString linepart(buffer, *conv);
 				wxbuffer += linepart;
 				if (buffer[511] == '\1') {
diff --git a/aegisub/video_display.cpp b/aegisub/video_display.cpp
index 102a14aca..0f0eef2b6 100644
--- a/aegisub/video_display.cpp
+++ b/aegisub/video_display.cpp
@@ -285,9 +285,7 @@ void VideoDisplay::OnPaint(wxPaintEvent& event) {
 	wxPaintDC dc(this);
 
 	// Draw frame
-	dc.BeginDrawing();
 	if (provider) dc.DrawBitmap(GetFrame(frame_n),0,0);
-	dc.EndDrawing();
 }
 
 
@@ -415,7 +413,6 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
 		// Prepare drawing
 		wxMemoryDC dc;
 		dc.SelectObject(*backbuffer);
-		dc.BeginDrawing();
 
 		// Draw frame
 		dc.DrawBitmap(GetFrame(frame_n),0,0);
@@ -458,15 +455,10 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
 			dc.DrawText(text,dx,dy);
 		}
 
-		// End
-		dc.EndDrawing();
-
 		// Blit to screen
 		wxClientDC dcScreen(this);
-		dcScreen.BeginDrawing();
 		//dcScreen.DrawBitmap(backbuffer,0,0);
 		dcScreen.Blit(0,0,w,h,&dc,0,0);
-		dcScreen.EndDrawing();
 	}
 }
 
@@ -780,13 +772,10 @@ void VideoDisplay::DrawTrackingOverlay( wxDC &dc )
 void VideoDisplay::RefreshVideo() {
 	// Draw frame
 	wxClientDC dc(this);
-	dc.BeginDrawing();
 	dc.DrawBitmap(GetFrame(),0,0);
 
 	// Draw the control points for FexTracker
 	DrawTrackingOverlay( dc );
-
-	dc.EndDrawing();
 }
 
 
@@ -795,7 +784,6 @@ void VideoDisplay::RefreshVideo() {
 void VideoDisplay::DrawText( wxPoint Pos, wxString text ) {
 	// Draw frame
 	wxClientDC dc(this);
-	dc.BeginDrawing();
 	dc.SetBrush(wxBrush(wxColour(128,128,128),wxSOLID));
 	dc.DrawRectangle( 0,0, provider->GetWidth(), provider->GetHeight() );
 	dc.SetTextForeground(wxColour(64,64,64));
@@ -805,7 +793,6 @@ void VideoDisplay::DrawText( wxPoint Pos, wxString text ) {
 	dc.DrawText(text,Pos.x-1,Pos.y+1);
 	dc.SetTextForeground(wxColour(255,255,255));
 	dc.DrawText(text,Pos.x,Pos.y);
-	dc.EndDrawing();
 }
 
 
diff --git a/aegisub/video_slider.cpp b/aegisub/video_slider.cpp
index c9eff6c5d..ea7334471 100644
--- a/aegisub/video_slider.cpp
+++ b/aegisub/video_slider.cpp
@@ -373,9 +373,7 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) {
 // Paint event
 void VideoSlider::OnPaint(wxPaintEvent &event) {
 	wxPaintDC dc(this);
-	dc.BeginDrawing();
 	DrawImage(dc);
-	dc.EndDrawing();
 }
 
 
@@ -472,9 +470,7 @@ void VideoSlider::DrawImage(wxDC &dc) {
 // Update image
 void VideoSlider::UpdateImage () {
 	wxClientDC dc(this);
-	dc.BeginDrawing();
 	DrawImage(dc);
-	dc.EndDrawing();
 }