From f42c2a7a62bf1053df1e8c66635852fc5631251e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 24 Feb 2000 16:26:20 +0000 Subject: [PATCH] wxToolBarSimple fix + OGL studio sample compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/tbarsmpl.h | 1 - src/generic/tbarsmpl.cpp | 11 +++++++++++ utils/ogl/samples/ogledit/doc.cpp | 4 ++-- utils/ogl/samples/studio/csprint.cpp | 2 ++ utils/ogl/samples/studio/shapes.cpp | 8 ++++---- utils/ogl/samples/studio/view.cpp | 4 ++-- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h index 4fed98e06a..195b930f34 100644 --- a/include/wx/tbarsmpl.h +++ b/include/wx/tbarsmpl.h @@ -155,7 +155,6 @@ protected: bool m_yScrollingEnabled; int m_xScrollPosition; int m_yScrollPosition; - bool m_calcScrolledOffset; // If TRUE, wxCanvasDC uses scrolled offsets int m_xScrollLines; int m_yScrollLines; int m_xScrollLinesPerPage; diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp index 88f45ba452..f5fd33d741 100644 --- a/src/generic/tbarsmpl.cpp +++ b/src/generic/tbarsmpl.cpp @@ -143,6 +143,17 @@ void wxToolBarSimple::Init() m_defaultWidth = 16; m_defaultHeight = 15; + + m_xScrollPixelsPerLine = 1; + m_yScrollPixelsPerLine = 1; + m_xScrollingEnabled = FALSE; + m_yScrollingEnabled = FALSE; + m_xScrollPosition = 0; + m_yScrollPosition = 0; + m_xScrollLines = 0; + m_yScrollLines = 0; + m_xScrollLinesPerPage = 0; + m_yScrollLinesPerPage = 0; } wxToolBarToolBase *wxToolBarSimple::AddTool(int id, diff --git a/utils/ogl/samples/ogledit/doc.cpp b/utils/ogl/samples/ogledit/doc.cpp index b5f2ef9e89..3557696662 100644 --- a/utils/ogl/samples/ogledit/doc.cpp +++ b/utils/ogl/samples/ogledit/doc.cpp @@ -495,7 +495,7 @@ void MyEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment GetShape()->GetCanvas()->PrepareDC(dc); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); dc.SetPen(dottedPen); double xp, yp; GetShape()->GetAttachmentPosition(attachment, &xp, &yp); @@ -512,7 +512,7 @@ void MyEvtHandler::OnDragRight(bool draw, double x, double y, int keys, int atta GetShape()->GetCanvas()->PrepareDC(dc); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); dc.SetPen(dottedPen); double xp, yp; GetShape()->GetAttachmentPosition(attachment, &xp, &yp); diff --git a/utils/ogl/samples/studio/csprint.cpp b/utils/ogl/samples/studio/csprint.cpp index 8006c2717f..6bf5dad26e 100644 --- a/utils/ogl/samples/studio/csprint.cpp +++ b/utils/ogl/samples/studio/csprint.cpp @@ -211,12 +211,14 @@ bool wxDiagramClipboard::CopyToClipboard(double scale) // Copy the bitmap to the clipboard wxSetClipboardData(wxDF_BITMAP, newBitmap, 0, 0); +#if 0 // TODO: replace this code (wxEnhMetaFile doesn't have SetClipboard) if (mf) { // Copy the metafile to the clipboard // Allow a small margin bool success = mf->SetClipboard((int)(mfDC.MaxX() + 15), (int)(mfDC.MaxY() + 15)); } +#endif // Close clipboard wxCloseClipboard(); diff --git a/utils/ogl/samples/studio/shapes.cpp b/utils/ogl/samples/studio/shapes.cpp index ddae9bf453..92657392dd 100644 --- a/utils/ogl/samples/studio/shapes.cpp +++ b/utils/ogl/samples/studio/shapes.cpp @@ -194,7 +194,7 @@ void csEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment GetShape()->GetCanvas()->PrepareDC(dc); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); dc.SetPen(dottedPen); double xp, yp; GetShape()->GetAttachmentPositionEdge(attachment, &xp, &yp); @@ -208,7 +208,7 @@ void csEvtHandler::OnDragRight(bool draw, double x, double y, int keys, int atta GetShape()->GetCanvas()->PrepareDC(dc); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); dc.SetPen(dottedPen); double xp, yp; GetShape()->GetAttachmentPositionEdge(attachment, &xp, &yp); @@ -277,7 +277,7 @@ void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attac wxClientDC dc(GetShape()->GetCanvas()); GetShape()->GetCanvas()->PrepareDC(dc); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); dc.SetPen(dottedPen); @@ -346,7 +346,7 @@ void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment) double offsetX = xx - g_DragStartX; double offsetY = yy - g_DragStartY; - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); dc.SetPen(dottedPen); diff --git a/utils/ogl/samples/studio/view.cpp b/utils/ogl/samples/studio/view.cpp index d9a3d132ab..da5e0f21f1 100644 --- a/utils/ogl/samples/studio/view.cpp +++ b/utils/ogl/samples/studio/view.cpp @@ -965,7 +965,7 @@ void csCanvas::OnDragLeft(bool draw, double x, double y, int keys) wxClientDC dc(this); PrepareDC(dc); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); DrawOutline(dc, sg_initialX, sg_initialY, x, y); } @@ -977,7 +977,7 @@ void csCanvas::OnBeginDragLeft(double x, double y, int keys) wxClientDC dc(this); PrepareDC(dc); - dc.SetLogicalFunction(wxXOR); + dc.SetLogicalFunction(OGLRBLF); DrawOutline(dc, sg_initialX, sg_initialY, x, y); CaptureMouse(); } -- 2.47.2