more updates for recent toolbar changes

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

diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index 6698e5b143727083f75a9a5443291775afbd6fb6..f6731b8400e0e24391587ea429b2cf771527f5bc 100644 (file)
--- a/contrib/src/ogl/ogldiag.cpp
+++ b/contrib/src/ogl/ogldiag.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -26,6 +26,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>


@@ -33,7 +37,7 @@
 #include <iostream>
 #include <fstream>
 #ifdef _MSC_VER
 #include <iostream>
 #include <fstream>
 #ifdef _MSC_VER

-using namespace std;
+//using namespace std;

 #endif
 #endif
 
 #endif
 #endif