don't use wxStaticCast to wxBookCtrlBase -- it doesn't work

[wxWidgets.git] / contrib / src / ogl / canvas.cpp

diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
index 239fcd000b18a891c2da596c82dd8e256b87fe65..3d9ec3d3664c124bfa74c82168770ca1c4e2ba45 100644 (file)
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "canvas.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -21,11 +17,11 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 #if wxUSE_PROLOGIO
-#include <wx/deprecated/wxexpr.h>
+#include "wx/deprecated/wxexpr.h"
 #endif
 
 #ifdef new
@@ -393,7 +389,7 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
   //     the other objects
   // (b) to find the control points FIRST if they exist
 
-  wxNode *current = GetDiagram()->GetShapeList()->GetLast();
+  wxObjectList::compatibility_iterator current = GetDiagram()->GetShapeList()->GetLast();
   while (current)
   {
     wxShape *object = (wxShape *)current->GetData();
@@ -451,7 +447,7 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
         {
           nearest_object = object;
           nearest_attachment = temp_attachment;
-          current = NULL;
+          current = GetDiagram()->GetShapeList()->GetFirst()->GetPrevious(); // finish loop
         }
       }
     }