Changes for wxOGL since wxFatalError has been deprecated.

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

diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
index ba237db51f65681ac841394d8b5c83e0d7a14858..05447d5a589207903a8375fe6fcb5986264d82c2 100644 (file)
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -723,7 +723,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
     if (objExpr1 && objExpr1->GetClientData())
       m_constrainingObject = (wxShape *)objExpr1->GetClientData();
     else
-      wxFatalError("Couldn't find constraining image of composite.", "Object graphics error");
+      wxLogFatalError("Object graphics error: Couldn't find constraining image of composite.");
 
     int i = 0;
     wxExpr *currentIdExpr = constrainedExpr->Nth(i);
@@ -737,7 +737,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
       }
       else
       {
-        wxFatalError("Couldn't find constrained image of composite.", "Object graphics error");
+        wxLogFatalError("Object graphics error: Couldn't find constrained image of composite.");
       }
 
       i ++;
@@ -1747,7 +1747,7 @@ void wxDivisionShape::PopupMenu(double x, double y)
     oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, FALSE);
 
   int x1, y1;
-  m_canvas->ViewStart(&x1, &y1);
+  m_canvas->GetViewStart(&x1, &y1);
 
   int unit_x, unit_y;
   m_canvas->GetScrollPixelsPerUnit(&unit_x, &unit_y);