Warning fixes, source cleaning.

[wxWidgets.git] / contrib / include / wx / ogl / lines.h

diff --git a/contrib/include/wx/ogl/lines.h b/contrib/include/wx/ogl/lines.h
index 22d7a3b22c93bf9b06a482c838ff5e091fa9d85c..e5df1f966001b1cfb6cb91508b6f38c3953a0129 100644 (file)
--- a/contrib/include/wx/ogl/lines.h
+++ b/contrib/include/wx/ogl/lines.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_LINES_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_LINES_H_


@@ -16,9 +16,10 @@
 #pragma interface "lines.h"
 #endif
 
 #pragma interface "lines.h"
 #endif
 

-class wxLabelShape;
-class wxPseudoMetaFile;
-class wxLineControlPoint;
+
+class WXDLLIMPEXP_OGL wxLabelShape;
+class WXDLLIMPEXP_OGL wxPseudoMetaFile;
+class WXDLLIMPEXP_OGL wxLineControlPoint;

 /*
  * Arcs with multiple arrowheads
  *
 /*
  * Arcs with multiple arrowheads
  *


@@ -46,12 +47,12 @@ class wxLineControlPoint;
 #define LINE_ALIGNMENT_TO_NEXT_HANDLE     2
 #define LINE_ALIGNMENT_NONE               0
 
 #define LINE_ALIGNMENT_TO_NEXT_HANDLE     2
 #define LINE_ALIGNMENT_NONE               0
 

-class wxArrowHead: public wxObject
+class WXDLLIMPEXP_OGL wxArrowHead: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxArrowHead)
 
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxArrowHead)
 
  public:

-  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = "", wxPseudoMetaFile *mf = NULL,
+  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = wxEmptyString, wxPseudoMetaFile *mf = NULL,

             long arrowId = -1);
   ~wxArrowHead();
   wxArrowHead(wxArrowHead& toCopy);
             long arrowId = -1);
   ~wxArrowHead();
   wxArrowHead(wxArrowHead& toCopy);


@@ -82,14 +83,14 @@ class wxArrowHead: public wxObject
   double             m_spacing;          // Spacing from the last arrowhead
   double             m_arrowSize;        // Length of arrowhead
   wxString          m_arrowName;        // Name of arrow
   double             m_spacing;          // Spacing from the last arrowhead
   double             m_arrowSize;        // Length of arrowhead
   wxString          m_arrowName;        // Name of arrow

-  bool              m_saveToFile;       // TRUE if we want to save custom arrowheads to file.
+  bool              m_saveToFile;       // true if we want to save custom arrowheads to file.

   wxPseudoMetaFile* m_metaFile;         // Pseudo metafile if this is a custom arrowhead
   long              m_id;               // identifier
 };
 
 // Line object
   wxPseudoMetaFile* m_metaFile;         // Pseudo metafile if this is a custom arrowhead
   long              m_id;               // identifier
 };
 
 // Line object

-class wxLabelShape;
-class wxLineShape: public wxShape
+class WXDLLIMPEXP_OGL wxLabelShape;
+class WXDLLIMPEXP_OGL wxLineShape: public wxShape

 {
  DECLARE_DYNAMIC_CLASS(wxLineShape)
 
 {
  DECLARE_DYNAMIC_CLASS(wxLineShape)
 


@@ -101,14 +102,14 @@ class wxLineShape: public wxShape
   // correct position
   // moveControlPoints must be disabled when a control point is being
   // dragged.
   // correct position
   // moveControlPoints must be disabled when a control point is being
   // dragged.

-  void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);

   void OnDraw(wxDC& dc);
   void OnDrawContents(wxDC& dc);
   void OnDrawControlPoints(wxDC& dc);
   void OnEraseControlPoints(wxDC& dc);
   void OnErase(wxDC& dc);
   void OnDraw(wxDC& dc);
   void OnDrawContents(wxDC& dc);
   void OnDrawControlPoints(wxDC& dc);
   void OnEraseControlPoints(wxDC& dc);
   void OnErase(wxDC& dc);

-  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return FALSE; }
+  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return false; }

   virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
   virtual bool OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display);
   void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
   virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
   virtual bool OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display);
   void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);


@@ -175,9 +176,9 @@ class wxLineShape: public wxShape
   virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
 
   // Override select, to create/delete temporary label-moving objects
   virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
 
   // Override select, to create/delete temporary label-moving objects

-  void Select(bool select = TRUE, wxDC* dc = NULL);
+  void Select(bool select = true, wxDC* dc = NULL);

 
 

-  // Set to spline (TRUE) or line (FALSE)
+  // Set to spline (true) or line (false)

   inline void SetSpline(bool spl) { m_isSpline = spl; }
   inline bool IsSpline() const { return m_isSpline; }
 
   inline void SetSpline(bool spl) { m_isSpline = spl; }
   inline bool IsSpline() const { return m_isSpline; }
 


@@ -203,15 +204,16 @@ class wxLineShape: public wxShape
   // This is really to distinguish between lines and other images.
   // For lines, want to pass drag to canvas, since lines tend to prevent
   // dragging on a canvas (they get in the way.)
   // This is really to distinguish between lines and other images.
   // For lines, want to pass drag to canvas, since lines tend to prevent
   // dragging on a canvas (they get in the way.)

-  virtual bool Draggable() const { return FALSE; }
+  virtual bool Draggable() const { return false; }

 
   // Does the copying for this object
   void Copy(wxShape& copy);
 
   // Add an arrowhead.
   wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
 
   // Does the copying for this object
   void Copy(wxShape& copy);
 
   // Add an arrowhead.
   wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,

-                double arrowSize = 10.0, double xOffset = 0.0, const wxString& name = "",
-                wxPseudoMetaFile *mf = NULL, long arrowId = -1);
+                        double arrowSize = 10.0, double xOffset = 0.0,
+                        const wxString& name = wxEmptyString,
+                        wxPseudoMetaFile *mf = NULL, long arrowId = -1);

 
   // Add an arrowhead in the position indicated by the reference
   // list of arrowheads, which contains all legal arrowheads for this
 
   // Add an arrowhead in the position indicated by the reference
   // list of arrowheads, which contains all legal arrowheads for this


@@ -219,7 +221,7 @@ class wxLineShape: public wxShape
   // E.g. reference list:      a b c d e
   //      Current line list:   a d
   // Add c, then line list is: a c d
   // E.g. reference list:      a b c d e
   //      Current line list:   a d
   // Add c, then line list is: a c d

-  // If no legal arrowhead position, return FALSE.
+  // If no legal arrowhead position, return false.

   // Assume reference list is for one end only, since it potentially defines
   // the ordering for any one of the 3 positions. So we don't check
   // the reference list for arrowhead position.
   // Assume reference list is for one end only, since it potentially defines
   // the ordering for any one of the 3 positions. So we don't check
   // the reference list for arrowhead position.


@@ -246,6 +248,8 @@ class wxLineShape: public wxShape
   void SetAlignmentType(bool isEnd, int alignType);
   bool GetAlignmentOrientation(bool isEnd);
   int GetAlignmentType(bool isEnd);
   void SetAlignmentType(bool isEnd, int alignType);
   bool GetAlignmentOrientation(bool isEnd);
   int GetAlignmentType(bool isEnd);

+  int GetAlignmentStart() const { return m_alignmentStart; }
+  int GetAlignmentEnd() const { return m_alignmentEnd; }

 
   // Find next control point in line after the start/end point
   // (depending on whether the node object is at start or end)
 
   // Find next control point in line after the start/end point
   // (depending on whether the node object is at start or end)