Added $(OVERRIDEFLAGS) to the end of the flags so default flags can be overridden.

[wxWidgets.git] / utils / ogl / src / ogldiag.cpp

diff --git a/utils/ogl/src/ogldiag.cpp b/utils/ogl/src/ogldiag.cpp
index 8ca66e30e86d132952a271373d1a4a8b55f3c615..3961607b187be04645524dfd2eabb82e19f2fbe5 100644 (file)
--- a/utils/ogl/src/ogldiag.cpp
+++ b/utils/ogl/src/ogldiag.cpp
@@ -24,17 +24,19 @@
 #include <wx/wx.h>
 #endif
 
-#ifdef PROLOGIO
 #include <wx/wxexpr.h>
-#endif
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
+#include <fstream.h>
 #else
 #include <iostream>
+#include <fstream>
+#ifdef _MSC_VER
+using namespace std;
+#endif
 #endif
 
-#include <fstream.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
@@ -91,7 +93,7 @@ void wxDiagram::Redraw(wxDC& dc)
   if (m_shapeList)
   {
     if (GetCanvas())
-      GetCanvas()->SetCursor(wxHOURGLASS_CURSOR);
+      GetCanvas()->SetCursor(* wxHOURGLASS_CURSOR);
     wxNode *current = m_shapeList->First();
 
     while (current)
@@ -103,7 +105,7 @@ void wxDiagram::Redraw(wxDC& dc)
       current = current->Next();
     }
     if (GetCanvas())
-      GetCanvas()->SetCursor(wxSTANDARD_CURSOR);
+      GetCanvas()->SetCursor(* wxSTANDARD_CURSOR);
   }
 }
 
@@ -189,20 +191,20 @@ void wxDiagram::DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2
 
   wxPoint points[5];
 
-  points[0].x = x1;
-  points[0].y = y1;
+  points[0].x = (int) x1;
+  points[0].y = (int) y1;
 
-  points[1].x = x2;
-  points[1].y = y1;
+  points[1].x = (int) x2;
+  points[1].y = (int) y1;
 
-  points[2].x = x2;
-  points[2].y = y2;
+  points[2].x = (int) x2;
+  points[2].y = (int) y2;
 
-  points[3].x = x1;
-  points[3].y = y2;
+  points[3].x = (int) x1;
+  points[3].y = (int) y2;
 
-  points[4].x = x1;
-  points[4].y = y1;
+  points[4].x = (int) x1;
+  points[4].y = (int) y1;
   dc.DrawLines(5, points);
 }