X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ba06d5a8ccf8c224fcfbd52fa01a55abf7befbd..2edad6fc48eb24235bbbb28345a568c1d859b15c:/contrib/samples/ogl/studio/csprint.cpp

diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp
index ff3e0ec461..c4bc38f4df 100644
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ b/contrib/samples/ogl/studio/csprint.cpp
@@ -24,8 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#include <wx/deprecated/setup.h>
-#include <wx/deprecated/wxexpr.h>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
 
 #include <wx/clipbrd.h>
 
@@ -70,7 +69,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
 
     // First copy all node shapes.
     wxList* shapeList = diagramFrom->GetShapeList();
-    wxNode* node = shapeList->GetFirst();
+    wxObjectList::compatibility_iterator node = shapeList->GetFirst();
     while (node)
     {
         wxShape* shape = (wxShape*) node->GetData();
@@ -137,7 +136,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
             // Make a list of all the new lines, in the same order as the old lines.
             // Then apply the list of new lines to the shape.
             wxList newLines;
-            wxNode* lineNode = shape->GetLines().GetFirst();
+            wxObjectList::compatibility_iterator lineNode = shape->GetLines().GetFirst();
             while (lineNode)
             {
                 wxLineShape* lineShape = (wxLineShape*) lineNode->GetData();
@@ -190,7 +189,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
     if (!newBitmap->Ok())
     {
       delete newBitmap;
-      
+
       wxChar buf[200];
       wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
       wxMessageBox(buf, _T("Clipboard copy problem"));
@@ -226,7 +225,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
         // Close clipboard
         wxCloseClipboard();
     }
-    
+
     delete newBitmap;
     delete mf;