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

Clear -> ClearBackground

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-08-14 16:29:34 +00:00
parent dce0742b30
commit 1d14c0051c
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/dialogs/dialogs.cpp
View File

@@ -242,7 +242,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
wxColourData retData = dialog.GetColourData(); wxColourData retData = dialog.GetColourData();
col = retData.GetColour(); col = retData.GetColour();
myCanvas->SetBackgroundColour(col); myCanvas->SetBackgroundColour(col);
myCanvas->Clear(); myCanvas->ClearBackground();
myCanvas->Refresh(); myCanvas->Refresh();
} }
} }
@@ -288,7 +288,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
wxColour col = retData.GetColour(); wxColour col = retData.GetColour();
// wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID); // wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID);
myCanvas->SetBackgroundColour(col); myCanvas->SetBackgroundColour(col);
myCanvas->Clear(); myCanvas->ClearBackground();
myCanvas->Refresh(); myCanvas->Refresh();
} }
dialog->Destroy(); dialog->Destroy();

2
samples/docview/docview.cpp
View File

@@ -269,7 +269,7 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
// Give it scrollbars // Give it scrollbars
canvas->SetScrollbars(20, 20, 50, 50); canvas->SetScrollbars(20, 20, 50, 50);
canvas->SetBackgroundColour(*wxWHITE); canvas->SetBackgroundColour(*wxWHITE);
canvas->Clear(); canvas->ClearBackground();
return canvas; return canvas;
} }

2
samples/docview/view.cpp
View File

@@ -127,7 +127,7 @@ bool DrawingView::OnClose(bool deleteWindow)
// Clear the canvas in case we're in single-window mode, // Clear the canvas in case we're in single-window mode,
// and the canvas stays. // and the canvas stays.
canvas->Clear(); canvas->ClearBackground();
canvas->view = (wxView *) NULL; canvas->view = (wxView *) NULL;
canvas = (MyCanvas *) NULL; canvas = (MyCanvas *) NULL;

18
samples/docvwmdi/view.cpp
View File

@@ -106,7 +106,7 @@ bool DrawingView::OnClose(bool deleteWindow)
// Clear the canvas in case we're in single-window mode, // Clear the canvas in case we're in single-window mode,
// and the canvas stays. // and the canvas stays.
canvas->Clear(); canvas->ClearBackground();
canvas->view = (wxView *) NULL; canvas->view = (wxView *) NULL;
canvas = (MyCanvas *) NULL; canvas = (MyCanvas *) NULL;
@@ -117,7 +117,7 @@ bool DrawingView::OnClose(bool deleteWindow)
SetFrame((wxFrame*)NULL); SetFrame((wxFrame*)NULL);
Activate(FALSE); Activate(FALSE);
if (deleteWindow) if (deleteWindow)
{ {
delete frame; delete frame;
@@ -152,7 +152,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
frame->Show(TRUE); frame->Show(TRUE);
Activate(TRUE); Activate(TRUE);
return TRUE; return TRUE;
} }
@@ -169,7 +169,7 @@ bool TextEditView::OnClose(bool deleteWindow)
{ {
if (!GetDocument()->Close()) if (!GetDocument()->Close())
return FALSE; return FALSE;
Activate(FALSE); Activate(FALSE);
if (deleteWindow) if (deleteWindow)
@@ -208,7 +208,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
{ {
if (!view) if (!view)
return; return;
static DoodleSegment *currentSegment = (DoodleSegment *) NULL; static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
wxClientDC dc(this); wxClientDC dc(this);
@@ -236,19 +236,19 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
currentSegment = (DoodleSegment *) NULL; currentSegment = (DoodleSegment *) NULL;
} }
} }
if (xpos > -1 && ypos > -1 && event.Dragging()) if (xpos > -1 && ypos > -1 && event.Dragging())
{ {
if (!currentSegment) if (!currentSegment)
currentSegment = new DoodleSegment; currentSegment = new DoodleSegment;
DoodleLine *newLine = new DoodleLine; DoodleLine *newLine = new DoodleLine;
newLine->x1 = (long)xpos; newLine->x1 = (long)xpos;
newLine->y1 = (long)ypos; newLine->y1 = (long)ypos;
newLine->x2 = pt.x; newLine->x2 = pt.x;
newLine->y2 = pt.y; newLine->y2 = pt.y;
currentSegment->lines.Append(newLine); currentSegment->lines.Append(newLine);
dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y); dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
} }
xpos = pt.x; xpos = pt.x;