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

wxToolBarSimple fix + OGL studio sample compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-24 16:26:20 +00:00
parent dc1efb1d9f
commit f42c2a7a62
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/tbarsmpl.h
View File

@@ -155,7 +155,6 @@ protected:
bool m_yScrollingEnabled; bool m_yScrollingEnabled;
int m_xScrollPosition; int m_xScrollPosition;
int m_yScrollPosition; int m_yScrollPosition;
bool m_calcScrolledOffset; // If TRUE, wxCanvasDC uses scrolled offsets
int m_xScrollLines; int m_xScrollLines;
int m_yScrollLines; int m_yScrollLines;
int m_xScrollLinesPerPage; int m_xScrollLinesPerPage;

11
src/generic/tbarsmpl.cpp
View File

@@ -143,6 +143,17 @@ void wxToolBarSimple::Init()
m_defaultWidth = 16; m_defaultWidth = 16;
m_defaultHeight = 15; 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, wxToolBarToolBase *wxToolBarSimple::AddTool(int id,

4
utils/ogl/samples/ogledit/doc.cpp
View File

@@ -495,7 +495,7 @@ void MyEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment
GetShape()->GetCanvas()->PrepareDC(dc); GetShape()->GetCanvas()->PrepareDC(dc);
wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
dc.SetPen(dottedPen); dc.SetPen(dottedPen);
double xp, yp; double xp, yp;
GetShape()->GetAttachmentPosition(attachment, &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); GetShape()->GetCanvas()->PrepareDC(dc);
wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
dc.SetPen(dottedPen); dc.SetPen(dottedPen);
double xp, yp; double xp, yp;
GetShape()->GetAttachmentPosition(attachment, &xp, &yp); GetShape()->GetAttachmentPosition(attachment, &xp, &yp);

2
utils/ogl/samples/studio/csprint.cpp
View File

@@ -211,12 +211,14 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
// Copy the bitmap to the clipboard // Copy the bitmap to the clipboard
wxSetClipboardData(wxDF_BITMAP, newBitmap, 0, 0); wxSetClipboardData(wxDF_BITMAP, newBitmap, 0, 0);
#if 0 // TODO: replace this code (wxEnhMetaFile doesn't have SetClipboard)
if (mf) if (mf)
{ {
// Copy the metafile to the clipboard // Copy the metafile to the clipboard
// Allow a small margin // Allow a small margin
bool success = mf->SetClipboard((int)(mfDC.MaxX() + 15), (int)(mfDC.MaxY() + 15)); bool success = mf->SetClipboard((int)(mfDC.MaxX() + 15), (int)(mfDC.MaxY() + 15));
} }
#endif
// Close clipboard // Close clipboard
wxCloseClipboard(); wxCloseClipboard();

8
utils/ogl/samples/studio/shapes.cpp
View File

@@ -194,7 +194,7 @@ void csEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment
GetShape()->GetCanvas()->PrepareDC(dc); GetShape()->GetCanvas()->PrepareDC(dc);
wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
dc.SetPen(dottedPen); dc.SetPen(dottedPen);
double xp, yp; double xp, yp;
GetShape()->GetAttachmentPositionEdge(attachment, &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); GetShape()->GetCanvas()->PrepareDC(dc);
wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
dc.SetPen(dottedPen); dc.SetPen(dottedPen);
double xp, yp; double xp, yp;
GetShape()->GetAttachmentPositionEdge(attachment, &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()); wxClientDC dc(GetShape()->GetCanvas());
GetShape()->GetCanvas()->PrepareDC(dc); GetShape()->GetCanvas()->PrepareDC(dc);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
dc.SetPen(dottedPen); dc.SetPen(dottedPen);
@@ -346,7 +346,7 @@ void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
double offsetX = xx - g_DragStartX; double offsetX = xx - g_DragStartX;
double offsetY = yy - g_DragStartY; double offsetY = yy - g_DragStartY;
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
dc.SetPen(dottedPen); dc.SetPen(dottedPen);

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

@@ -965,7 +965,7 @@ void csCanvas::OnDragLeft(bool draw, double x, double y, int keys)
wxClientDC dc(this); wxClientDC dc(this);
PrepareDC(dc); PrepareDC(dc);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
DrawOutline(dc, sg_initialX, sg_initialY, x, y); DrawOutline(dc, sg_initialX, sg_initialY, x, y);
} }
@@ -977,7 +977,7 @@ void csCanvas::OnBeginDragLeft(double x, double y, int keys)
wxClientDC dc(this); wxClientDC dc(this);
PrepareDC(dc); PrepareDC(dc);
dc.SetLogicalFunction(wxXOR); dc.SetLogicalFunction(OGLRBLF);
DrawOutline(dc, sg_initialX, sg_initialY, x, y); DrawOutline(dc, sg_initialX, sg_initialY, x, y);
CaptureMouse(); CaptureMouse();
} }