Fixed problem in InsertItems of always adding ownerdraw data even when

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

diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
index fd88350efc33e162893905f825e6c1c243d3122d..ded8e3be127ead8eabf49856e290aab4e148a1ae 100644 (file)
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@@ -723,7 +723,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
     if (objExpr1 && objExpr1->GetClientData())
       m_constrainingObject = (wxShape *)objExpr1->GetClientData();
     else
     if (objExpr1 && objExpr1->GetClientData())
       m_constrainingObject = (wxShape *)objExpr1->GetClientData();
     else

-      wxFatalError("Couldn't find constraining image of composite.", "Object graphics error");
+      wxLogFatalError(wxT("Object graphics error: Couldn't find constraining image of composite."));

 
     int i = 0;
     wxExpr *currentIdExpr = constrainedExpr->Nth(i);
 
     int i = 0;
     wxExpr *currentIdExpr = constrainedExpr->Nth(i);


@@ -737,7 +737,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
       }
       else
       {
       }
       else
       {

-        wxFatalError("Couldn't find constrained image of composite.", "Object graphics error");
+        wxLogFatalError(wxT("Object graphics error: Couldn't find constrained image of composite."));

       }
 
       i ++;
       }
 
       i ++;


@@ -746,7 +746,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
     wxOGLConstraint *newConstraint = AddConstraint(cType, m_constrainingObject, m_constrainedObjects);
     newConstraint->SetSpacing(cXSpacing, cYSpacing);
     newConstraint->m_constraintId = cId;
     wxOGLConstraint *newConstraint = AddConstraint(cType, m_constrainingObject, m_constrainedObjects);
     newConstraint->SetSpacing(cXSpacing, cYSpacing);
     newConstraint->m_constraintId = cId;

-    newConstraint->m_constraintName = (const char*) cName;
+    newConstraint->m_constraintName = cName;

     constraintNo ++;
   }
 }
     constraintNo ++;
   }
 }