mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Removed some more superfluous Begin/EndDrawing

Browse source 
Originally committed to SVN as r690.
This commit is contained in:
Niels Martin Hansen 2007-01-03 03:56:40 +00:00
parent 74d54d3272
commit ab9e184009
3 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/text_file_reader.cpp
View file

@ -208,6 +208,7 @@ wxString TextFileReader::ReadLineFromFile() {
buffer[511] = '\1'; buffer[511] = '\1';
if (fgets(buffer, 512, file)) { if (fgets(buffer, 512, file)) {
// read succeeded // read succeeded
// FIXME, this might break on incomplete multibyte characters
wxString linepart(buffer, *conv); wxString linepart(buffer, *conv);
wxbuffer += linepart; wxbuffer += linepart;
if (buffer[511] == '\1') { if (buffer[511] == '\1') {

13
aegisub/video_display.cpp
View file

@ -285,9 +285,7 @@ void VideoDisplay::OnPaint(wxPaintEvent& event) {
wxPaintDC dc(this); wxPaintDC dc(this);
// Draw frame // Draw frame
dc.BeginDrawing();
if (provider) dc.DrawBitmap(GetFrame(frame_n),0,0); if (provider) dc.DrawBitmap(GetFrame(frame_n),0,0);
dc.EndDrawing();
} }
@ -415,7 +413,6 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
// Prepare drawing // Prepare drawing
wxMemoryDC dc; wxMemoryDC dc;
dc.SelectObject(*backbuffer); dc.SelectObject(*backbuffer);
dc.BeginDrawing();
// Draw frame // Draw frame
dc.DrawBitmap(GetFrame(frame_n),0,0); dc.DrawBitmap(GetFrame(frame_n),0,0);
@ -458,15 +455,10 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
dc.DrawText(text,dx,dy); dc.DrawText(text,dx,dy);
} }
// End
dc.EndDrawing();
// Blit to screen // Blit to screen
wxClientDC dcScreen(this); wxClientDC dcScreen(this);
dcScreen.BeginDrawing();
//dcScreen.DrawBitmap(backbuffer,0,0); //dcScreen.DrawBitmap(backbuffer,0,0);
dcScreen.Blit(0,0,w,h,&dc,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() { void VideoDisplay::RefreshVideo() {
// Draw frame // Draw frame
wxClientDC dc(this); wxClientDC dc(this);
dc.BeginDrawing();
dc.DrawBitmap(GetFrame(),0,0); dc.DrawBitmap(GetFrame(),0,0);
// Draw the control points for FexTracker // Draw the control points for FexTracker
DrawTrackingOverlay( dc ); DrawTrackingOverlay( dc );
dc.EndDrawing();
} }
@ -795,7 +784,6 @@ void VideoDisplay::RefreshVideo() {
void VideoDisplay::DrawText( wxPoint Pos, wxString text ) { void VideoDisplay::DrawText( wxPoint Pos, wxString text ) {
// Draw frame // Draw frame
wxClientDC dc(this); wxClientDC dc(this);
dc.BeginDrawing();
dc.SetBrush(wxBrush(wxColour(128,128,128),wxSOLID)); dc.SetBrush(wxBrush(wxColour(128,128,128),wxSOLID));
dc.DrawRectangle( 0,0, provider->GetWidth(), provider->GetHeight() ); dc.DrawRectangle( 0,0, provider->GetWidth(), provider->GetHeight() );
dc.SetTextForeground(wxColour(64,64,64)); 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.DrawText(text,Pos.x-1,Pos.y+1);
dc.SetTextForeground(wxColour(255,255,255)); dc.SetTextForeground(wxColour(255,255,255));
dc.DrawText(text,Pos.x,Pos.y); dc.DrawText(text,Pos.x,Pos.y);
dc.EndDrawing();
} }

4
aegisub/video_slider.cpp
View file

@ -373,9 +373,7 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) {
// Paint event // Paint event
void VideoSlider::OnPaint(wxPaintEvent &event) { void VideoSlider::OnPaint(wxPaintEvent &event) {
wxPaintDC dc(this); wxPaintDC dc(this);
dc.BeginDrawing();
DrawImage(dc); DrawImage(dc);
dc.EndDrawing();
} }
@ -472,9 +470,7 @@ void VideoSlider::DrawImage(wxDC &dc) {
// Update image // Update image
void VideoSlider::UpdateImage () { void VideoSlider::UpdateImage () {
wxClientDC dc(this); wxClientDC dc(this);
dc.BeginDrawing();
DrawImage(dc); DrawImage(dc);
dc.EndDrawing();
} }