Restore previous ogl sources. Waiting for fix in configure system

[wxWidgets.git] / utils / ogl / src / composit.h

diff --git a/utils/ogl/src/composit.h b/utils/ogl/src/composit.h
index 85dc9c129247794f23100866c95c98a2bf582731..bbbcc835d3d001c7b99d645e27afe86a043efeab 100644 (file)
--- a/utils/ogl/src/composit.h
+++ b/utils/ogl/src/composit.h
@@ -17,7 +17,7 @@
 #endif
 
 class wxDivisionShape;
-class OGLConstraint;
+class wxOGLConstraint;
 
 /*
  * A composite object is an invisible rectangle surrounding all children
@@ -51,11 +51,11 @@ public:
   void AddChild(wxShape *child, wxShape *addAfter = NULL);
   void RemoveChild(wxShape *child);
 
-  OGLConstraint *AddConstraint(OGLConstraint *constraint);
-  OGLConstraint *AddConstraint(int type, wxShape *constraining, wxList& constrained);
-  OGLConstraint *AddConstraint(int type, wxShape *constraining, wxShape *constrained);
+  wxOGLConstraint *AddConstraint(wxOGLConstraint *constraint);
+  wxOGLConstraint *AddConstraint(int type, wxShape *constraining, wxList& constrained);
+  wxOGLConstraint *AddConstraint(int type, wxShape *constraining, wxShape *constrained);
 
-  void DeleteConstraint(OGLConstraint *constraint);
+  void DeleteConstraint(wxOGLConstraint *constraint);
 
   // Delete constraints that involve this child.
   void DeleteConstraintsInvolvingChild(wxShape *child);
@@ -66,7 +66,7 @@ public:
 
   // Find constraint, also returning actual composite the constraint was in,
   // in case it had to find it recursively.
-  OGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);
+  wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);
 
   // Returns TRUE if something changed
   bool Constrain();
@@ -78,9 +78,8 @@ public:
   void CalculateSize();
 
 #ifdef PROLOGIO
-  // Prolog database stuff
-  void WritePrologAttributes(wxExpr *clause);
-  void ReadPrologAttributes(wxExpr *clause);
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
   // In case the object has constraints it needs to read in in a different pass
   void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
 #endif
@@ -154,9 +153,8 @@ class wxDivisionShape: public wxCompositeShape
   void ResetMandatoryControlPoints();
 
 #ifdef PROLOGIO
-  // Prolog database stuff
-  void WritePrologAttributes(wxExpr *clause);
-  void ReadPrologAttributes(wxExpr *clause);
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
 #endif
   // Does the copying for this object
   void Copy(wxShape& copy);
@@ -227,8 +225,6 @@ class wxDivisionShape: public wxCompositeShape
   wxString              m_topSideStyle;
 };
 
-extern wxMenu *oglPopupDivisionMenu;
-extern void oglGraphicsDivisionMenuProc(wxMenu& menu, wxCommandEvent& event);
 
 #define DIVISION_MENU_SPLIT_HORIZONTALLY    1
 #define DIVISION_MENU_SPLIT_VERTICALLY      2