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

More Clear -> ClearBackground

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

100
contrib/samples/ogl/ogledit/view.cpp
View File

@@ -70,67 +70,67 @@ bool DiagramView::OnCreate(wxDocument *doc, long flags)
// Sneakily gets used for default print/preview // Sneakily gets used for default print/preview
// as well as drawing on the screen. // as well as drawing on the screen.
void DiagramView::OnDraw(wxDC *dc) void DiagramView::OnDraw(wxDC *dc)
{ {
/* You might use THIS code if you were scaling /* You might use THIS code if you were scaling
* graphics of known size to fit on the page. * graphics of known size to fit on the page.
*/ */
int w, h; int w, h;
// We need to adjust for the graphic size, a formula will be added // We need to adjust for the graphic size, a formula will be added
float maxX = 900; float maxX = 900;
float maxY = 700; float maxY = 700;
// A better way of find the maxium values would be to search through // A better way of find the maxium values would be to search through
// the linked list // the linked list
// Let's have at least 10 device units margin // Let's have at least 10 device units margin
float marginX = 10; float marginX = 10;
float marginY = 10; float marginY = 10;
// Add the margin to the graphic size // Add the margin to the graphic size
maxX += (2 * marginX); maxX += (2 * marginX);
maxY += (2 * marginY); maxY += (2 * marginY);
// Get the size of the DC in pixels // Get the size of the DC in pixels
dc->GetSize (&w, &h); dc->GetSize (&w, &h);
// Calculate a suitable scaling factor // Calculate a suitable scaling factor
float scaleX = (float) (w / maxX); float scaleX = (float) (w / maxX);
float scaleY = (float) (h / maxY); float scaleY = (float) (h / maxY);
// Use x or y scaling factor, whichever fits on the DC // Use x or y scaling factor, whichever fits on the DC
float actualScale = wxMin (scaleX, scaleY); float actualScale = wxMin (scaleX, scaleY);
float posX, posY; float posX, posY;
// Calculate the position on the DC for centring the graphic // Calculate the position on the DC for centring the graphic
if (CENTER == TRUE) // center the drawing if (CENTER == TRUE) // center the drawing
{ {
posX = (float) ((w - (200 * actualScale)) / 2.0); posX = (float) ((w - (200 * actualScale)) / 2.0);
posY = (float) ((h - (200 * actualScale)) / 2.0); posY = (float) ((h - (200 * actualScale)) / 2.0);
} }
else // Use defined presets else // Use defined presets
{ {
posX = 10; posX = 10;
posY = 35; posY = 35;
} }
// Set the scale and origin
dc->SetUserScale (actualScale, actualScale);
dc->SetDeviceOrigin ((long) posX, (long) posY);
// This part was added to preform the print preview and printing functions // Set the scale and origin
dc->SetUserScale (actualScale, actualScale);
dc->SetDeviceOrigin ((long) posX, (long) posY);
dc->BeginDrawing(); // Allows optimization of drawing code under MS Windows. // This part was added to preform the print preview and printing functions
dc->BeginDrawing(); // Allows optimization of drawing code under MS Windows.
wxDiagram *diagram_p=((DiagramDocument*)GetDocument())->GetDiagram(); // Get the current diagram wxDiagram *diagram_p=((DiagramDocument*)GetDocument())->GetDiagram(); // Get the current diagram
if (diagram_p->GetShapeList()) if (diagram_p->GetShapeList())
{ {
wxCursor *old_cursor = NULL; wxCursor *old_cursor = NULL;
wxNode *current = diagram_p->GetShapeList()->First(); wxNode *current = diagram_p->GetShapeList()->First();
while (current) // Loop through the entire list of shapes while (current) // Loop through the entire list of shapes
{ {
wxShape *object = (wxShape *)current->Data(); wxShape *object = (wxShape *)current->Data();
if (!object->GetParent()) if (!object->GetParent())
@@ -140,7 +140,7 @@ void DiagramView::OnDraw(wxDC *dc)
current = current->Next(); // Procede to the next shape in the list current = current->Next(); // Procede to the next shape in the list
} }
} }
dc->EndDrawing(); // Allows optimization of drawing code under MS Windows. dc->EndDrawing(); // Allows optimization of drawing code under MS Windows.
} }
void DiagramView::OnUpdate(wxView *sender, wxObject *hint) void DiagramView::OnUpdate(wxView *sender, wxObject *hint)
@@ -158,7 +158,7 @@ bool DiagramView::OnClose(bool deleteWindow)
DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument(); DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument();
diagramDoc->GetDiagram()->SetCanvas(NULL); diagramDoc->GetDiagram()->SetCanvas(NULL);
canvas->Clear(); canvas->ClearBackground();
canvas->SetDiagram(NULL); canvas->SetDiagram(NULL);
canvas->view = NULL; canvas->view = NULL;
canvas = NULL; canvas = NULL;
@@ -170,7 +170,7 @@ bool DiagramView::OnClose(bool deleteWindow)
SetFrame(NULL); SetFrame(NULL);
Activate(FALSE); Activate(FALSE);
return TRUE; return TRUE;
} }

4
contrib/samples/ogl/studio/view.cpp
View File

@@ -160,7 +160,7 @@ bool csDiagramView::OnClose(bool deleteWindow)
csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument(); csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument();
diagramDoc->GetDiagram()->SetCanvas(NULL); diagramDoc->GetDiagram()->SetCanvas(NULL);
canvas->Clear(); canvas->ClearBackground();
canvas->SetDiagram(NULL); canvas->SetDiagram(NULL);
canvas->SetView(NULL); canvas->SetView(NULL);
canvas = NULL; canvas = NULL;
@@ -177,7 +177,7 @@ bool csDiagramView::OnClose(bool deleteWindow)
{ {
frame->Destroy(); frame->Destroy();
} }
return TRUE; return TRUE;
} }