bug fix for OnLinkClicked callback

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

diff --git a/utils/ogl/src/drawn.h b/utils/ogl/src/drawn.h
index 0548ac36141b91a46076a11e70847ebf0dcf2e96..5632990696f15771372e98684fd47f00a46bcaaf 100644 (file)
--- a/utils/ogl/src/drawn.h
+++ b/utils/ogl/src/drawn.h
@@ -33,8 +33,8 @@ class wxPseudoMetaFile: public wxObject
   void Draw(wxDC& dc, double xoffset, double yoffset);
 
 #ifdef PROLOGIO
   void Draw(wxDC& dc, double xoffset, double yoffset);
 
 #ifdef PROLOGIO

-  void WritePrologAttributes(wxExpr *clause, int whichAngle);
-  void ReadPrologAttributes(wxExpr *clause, int whichAngle);
+  void WriteAttributes(wxExpr *clause, int whichAngle);
+  void ReadAttributes(wxExpr *clause, int whichAngle);

 #endif
 
   void Clear();
 #endif
 
   void Clear();


@@ -140,10 +140,9 @@ class wxDrawnShape: public wxRectangleShape
   void OnDraw(wxDC& dc);
 
 #ifdef PROLOGIO
   void OnDraw(wxDC& dc);
 
 #ifdef PROLOGIO

-  // Prolog database stuff
-  char *GetFunctor();
-  void WritePrologAttributes(wxExpr *clause);
-  void ReadPrologAttributes(wxExpr *clause);
+  // I/O
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);

 #endif
 
   // Does the copying for this object
 #endif
 
   // Does the copying for this object


@@ -190,12 +189,12 @@ class wxDrawnShape: public wxRectangleShape
   virtual void SetClippingRect(const wxRect& rect);
   virtual void DestroyClippingRect();
 
   virtual void SetClippingRect(const wxRect& rect);
   virtual void DestroyClippingRect();
 

-  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
-  virtual void SetFont(wxFont* font);
-  virtual void SetTextColour(const wxColour& colour);
-  virtual void SetBackgroundColour(const wxColour& colour);
-  virtual void SetBackgroundMode(int mode);
+  virtual void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetDrawnFont(wxFont* font);
+  virtual void SetDrawnTextColour(const wxColour& colour);
+  virtual void SetDrawnBackgroundColour(const wxColour& colour);
+  virtual void SetDrawnBackgroundMode(int mode);

 
   // Set the width/height according to the shapes in the metafile.
   // Call this after drawing into the shape.
 
   // Set the width/height according to the shapes in the metafile.
   // Call this after drawing into the shape.


@@ -205,6 +204,8 @@ class wxDrawnShape: public wxRectangleShape
 
   inline int GetAngle() const { return m_currentAngle; }
 
 
   inline int GetAngle() const { return m_currentAngle; }
 

+// Implementation
+protected:

   // Which metafile do we use now? Based on current rotation and validity
   // of metafiles.
   int DetermineMetaFile(double rotation);
   // Which metafile do we use now? Based on current rotation and validity
   // of metafiles.
   int DetermineMetaFile(double rotation);