reverted recent VK_OEM_PLUS change, do map it to '+' for now, but added a comment...

[wxWidgets.git] / contrib / samples / ogl / studio / shapes.cpp

diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
index da69c5b64c9dfc956fa12445000d4b0ae5287ee0..2129895d303e8ea33c429cd91762c444a06e5f2b 100644 (file)
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -301,7 +301,7 @@ void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attac
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes

-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();
   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();


@@ -360,7 +360,7 @@ void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes

-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();
   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();


@@ -415,7 +415,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
                 new csCommandState(ID_CS_MOVE, newShape, GetShape()));
 
   // Move line points
                 new csCommandState(ID_CS_MOVE, newShape, GetShape()));
 
   // Move line points

-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();
   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();


@@ -429,7 +429,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
         {
             wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
 
         {
             wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
 

-            wxNode *node1 = newLineShape->GetLineControlPoints()->GetFirst();
+            wxObjectList::compatibility_iterator node1 = newLineShape->GetLineControlPoints()->GetFirst();

             while (node1)
             {
                 wxRealPoint *point = (wxRealPoint *)node1->GetData();
             while (node1)
             {
                 wxRealPoint *point = (wxRealPoint *)node1->GetData();