Clear -> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dce0742b30
commit
1d14c0051c
@ -242,7 +242,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
|
||||
wxColourData retData = dialog.GetColourData();
|
||||
col = retData.GetColour();
|
||||
myCanvas->SetBackgroundColour(col);
|
||||
myCanvas->Clear();
|
||||
myCanvas->ClearBackground();
|
||||
myCanvas->Refresh();
|
||||
}
|
||||
}
|
||||
@ -288,7 +288,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
|
||||
wxColour col = retData.GetColour();
|
||||
// wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID);
|
||||
myCanvas->SetBackgroundColour(col);
|
||||
myCanvas->Clear();
|
||||
myCanvas->ClearBackground();
|
||||
myCanvas->Refresh();
|
||||
}
|
||||
dialog->Destroy();
|
||||
|
@ -269,7 +269,7 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
|
||||
// Give it scrollbars
|
||||
canvas->SetScrollbars(20, 20, 50, 50);
|
||||
canvas->SetBackgroundColour(*wxWHITE);
|
||||
canvas->Clear();
|
||||
canvas->ClearBackground();
|
||||
|
||||
return canvas;
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ bool DrawingView::OnClose(bool deleteWindow)
|
||||
|
||||
// Clear the canvas in case we're in single-window mode,
|
||||
// and the canvas stays.
|
||||
canvas->Clear();
|
||||
canvas->ClearBackground();
|
||||
canvas->view = (wxView *) NULL;
|
||||
canvas = (MyCanvas *) NULL;
|
||||
|
||||
|
@ -106,7 +106,7 @@ bool DrawingView::OnClose(bool deleteWindow)
|
||||
|
||||
// Clear the canvas in case we're in single-window mode,
|
||||
// and the canvas stays.
|
||||
canvas->Clear();
|
||||
canvas->ClearBackground();
|
||||
canvas->view = (wxView *) NULL;
|
||||
canvas = (MyCanvas *) NULL;
|
||||
|
||||
@ -117,7 +117,7 @@ bool DrawingView::OnClose(bool deleteWindow)
|
||||
SetFrame((wxFrame*)NULL);
|
||||
|
||||
Activate(FALSE);
|
||||
|
||||
|
||||
if (deleteWindow)
|
||||
{
|
||||
delete frame;
|
||||
@ -152,7 +152,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
|
||||
|
||||
frame->Show(TRUE);
|
||||
Activate(TRUE);
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -169,7 +169,7 @@ bool TextEditView::OnClose(bool deleteWindow)
|
||||
{
|
||||
if (!GetDocument()->Close())
|
||||
return FALSE;
|
||||
|
||||
|
||||
Activate(FALSE);
|
||||
|
||||
if (deleteWindow)
|
||||
@ -208,7 +208,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
{
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
|
||||
static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
|
||||
|
||||
wxClientDC dc(this);
|
||||
@ -236,19 +236,19 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
currentSegment = (DoodleSegment *) NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (xpos > -1 && ypos > -1 && event.Dragging())
|
||||
{
|
||||
if (!currentSegment)
|
||||
currentSegment = new DoodleSegment;
|
||||
|
||||
DoodleLine *newLine = new DoodleLine;
|
||||
newLine->x1 = (long)xpos;
|
||||
newLine->x1 = (long)xpos;
|
||||
newLine->y1 = (long)ypos;
|
||||
newLine->x2 = pt.x;
|
||||
newLine->x2 = pt.x;
|
||||
newLine->y2 = pt.y;
|
||||
currentSegment->lines.Append(newLine);
|
||||
|
||||
|
||||
dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
|
||||
}
|
||||
xpos = pt.x;
|
||||
|
Loading…
Reference in New Issue
Block a user