Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-1->wxID_ANY, TRUE->true, FALSE->false and tabs replacements. Correct help system in non MSW builds of OGL-Studio sample.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-09 16:42:34 +00:00
parent 45b8a2566d
commit 2ba06d5a8c
50 changed files with 835 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
contrib/include/wx/ogl/basic.h
View File

@@ -145,7 +145,7 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
virtual void OnDelete(); virtual void OnDelete();
virtual void OnDraw(wxDC& dc); virtual void OnDraw(wxDC& dc);
virtual void OnDrawContents(wxDC& dc); virtual void OnDrawContents(wxDC& dc);
virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE); virtual void OnDrawBranches(wxDC& dc, bool erase = false);
virtual void OnMoveLinks(wxDC& dc); virtual void OnMoveLinks(wxDC& dc);
virtual void OnErase(wxDC& dc); virtual void OnErase(wxDC& dc);
virtual void OnEraseContents(wxDC& dc); virtual void OnEraseContents(wxDC& dc);
@@ -154,8 +154,8 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0); virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0); virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
virtual void OnSize(double x, double y); virtual void OnSize(double x, double y);
virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE); virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE); virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0); virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
@@ -166,7 +166,7 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h); virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
virtual void OnDrawControlPoints(wxDC& dc); virtual void OnDrawControlPoints(wxDC& dc);
virtual void OnEraseControlPoints(wxDC& dc); virtual void OnEraseControlPoints(wxDC& dc);
virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE); virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
// Control points ('handles') redirect control to the actual shape, to make it easier // Control points ('handles') redirect control to the actual shape, to make it easier
// to override sizing behaviour. // to override sizing behaviour.
@@ -234,8 +234,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
virtual void OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys) = 0, int WXUNUSED(attachment) = 0) {} virtual void OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys) = 0, int WXUNUSED(attachment) = 0) {}
virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0); virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
virtual void OnSize(double x, double y); virtual void OnSize(double x, double y);
virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE); virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE); virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0); virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
@@ -268,24 +268,24 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
virtual void MakeMandatoryControlPoints(); virtual void MakeMandatoryControlPoints();
virtual void ResetMandatoryControlPoints(); virtual void ResetMandatoryControlPoints();
inline virtual bool Recompute() { return TRUE; }; inline virtual bool Recompute() { return true; };
// Calculate size recursively, if size changes. Size might depend on children. // Calculate size recursively, if size changes. Size might depend on children.
inline virtual void CalculateSize() { }; inline virtual void CalculateSize() { };
virtual void Select(bool select = TRUE, wxDC* dc = NULL); virtual void Select(bool select = true, wxDC* dc = NULL);
virtual void SetHighlight(bool hi = TRUE, bool recurse = FALSE); virtual void SetHighlight(bool hi = true, bool recurse = false);
inline virtual bool IsHighlighted() const { return m_highlighted; }; inline virtual bool IsHighlighted() const { return m_highlighted; };
virtual bool Selected() const; virtual bool Selected() const;
virtual bool AncestorSelected() const; virtual bool AncestorSelected() const;
void SetSensitivityFilter(int sens = OP_ALL, bool recursive = FALSE); void SetSensitivityFilter(int sens = OP_ALL, bool recursive = false);
int GetSensitivityFilter() const { return m_sensitivity; } int GetSensitivityFilter() const { return m_sensitivity; }
void SetDraggable(bool drag, bool recursive = FALSE); void SetDraggable(bool drag, bool recursive = false);
inline void SetFixedSize(bool x, bool y) { m_fixedWidth = x; m_fixedHeight = y; }; inline void SetFixedSize(bool x, bool y) { m_fixedWidth = x; m_fixedHeight = y; };
inline void GetFixedSize(bool *x, bool *y) const { *x = m_fixedWidth; *y = m_fixedHeight; }; inline void GetFixedSize(bool *x, bool *y) const { *x = m_fixedWidth; *y = m_fixedHeight; };
inline bool GetFixedWidth() const { return m_fixedWidth; } inline bool GetFixedWidth() const { return m_fixedWidth; }
inline bool GetFixedHeight() const { return m_fixedHeight; } inline bool GetFixedHeight() const { return m_fixedHeight; }
inline void SetSpaceAttachments(bool sp) { m_spaceAttachments = sp; }; inline void SetSpaceAttachments(bool sp) { m_spaceAttachments = sp; };
inline bool GetSpaceAttachments() const { return m_spaceAttachments; }; inline bool GetSpaceAttachments() const { return m_spaceAttachments; };
void SetShadowMode(int mode, bool redraw = FALSE); void SetShadowMode(int mode, bool redraw = false);
inline int GetShadowMode() const { return m_shadowMode; } inline int GetShadowMode() const { return m_shadowMode; }
virtual bool HitTest(double x, double y, int *attachment, double *distance); virtual bool HitTest(double x, double y, int *attachment, double *distance);
inline void SetCentreResize(bool cr) { m_centreResize = cr; } inline void SetCentreResize(bool cr) { m_centreResize = cr; }
@@ -305,19 +305,19 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
virtual void Show(bool show); virtual void Show(bool show);
virtual bool IsShown() const { return m_visible; } virtual bool IsShown() const { return m_visible; }
virtual void Move(wxDC& dc, double x1, double y1, bool display = TRUE); virtual void Move(wxDC& dc, double x1, double y1, bool display = true);
virtual void Erase(wxDC& dc); virtual void Erase(wxDC& dc);
virtual void EraseContents(wxDC& dc); virtual void EraseContents(wxDC& dc);
virtual void Draw(wxDC& dc); virtual void Draw(wxDC& dc);
virtual void Flash(); virtual void Flash();
virtual void MoveLinks(wxDC& dc); virtual void MoveLinks(wxDC& dc);
virtual void DrawContents(wxDC& dc); // E.g. for drawing text label virtual void DrawContents(wxDC& dc); // E.g. for drawing text label
virtual void SetSize(double x, double y, bool recursive = TRUE); virtual void SetSize(double x, double y, bool recursive = true);
virtual void SetAttachmentSize(double x, double y); virtual void SetAttachmentSize(double x, double y);
void Attach(wxShapeCanvas *can); void Attach(wxShapeCanvas *can);
void Detach(); void Detach();
inline virtual bool Constrain() { return FALSE; } ; inline virtual bool Constrain() { return false; } ;
void AddLine(wxLineShape *line, wxShape *other, void AddLine(wxLineShape *line, wxShape *other,
int attachFrom = 0, int attachTo = 0, int attachFrom = 0, int attachTo = 0,
@@ -413,13 +413,13 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
virtual wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2, virtual wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
int nth, int noArcs, wxLineShape* line); int nth, int noArcs, wxLineShape* line);
// Returns TRUE if pt1 <= pt2 in the sense that one point comes before another on an // Returns true if pt1 <= pt2 in the sense that one point comes before another on an
// edge of the shape. // edge of the shape.
// attachmentPoint is the attachment point (= side) in question. // attachmentPoint is the attachment point (= side) in question.
virtual bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2); virtual bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);
virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE); virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = false);
virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE); virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = false);
virtual bool MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move, virtual bool MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
double x, double y); double x, double y);
@@ -462,8 +462,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
virtual int GetAttachmentLineCount(int attachment) const; virtual int GetAttachmentLineCount(int attachment) const;
// Draw the branches (not the actual arcs though) // Draw the branches (not the actual arcs though)
virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = FALSE); virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = false);
virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE); virtual void OnDrawBranches(wxDC& dc, bool erase = false);
// Branching attachment settings // Branching attachment settings
inline void SetBranchNeckLength(int len) { m_branchNeckLength = len; } inline void SetBranchNeckLength(int len) { m_branchNeckLength = len; }
@@ -490,13 +490,13 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
// This is really to distinguish between lines and other images. // This is really to distinguish between lines and other images.
// For lines, want to pass drag to canvas, since lines tend to prevent // For lines, want to pass drag to canvas, since lines tend to prevent
// dragging on a canvas (they get in the way.) // dragging on a canvas (they get in the way.)
virtual bool Draggable() const { return TRUE; } virtual bool Draggable() const { return true; }
// Returns TRUE if image is a descendant of this image // Returns true if image is a descendant of this image
bool HasDescendant(wxShape *image); bool HasDescendant(wxShape *image);
// Creates a copy of this shape. // Creates a copy of this shape.
wxShape *CreateNewCopy(bool resetMapping = TRUE, bool recompute = TRUE); wxShape *CreateNewCopy(bool resetMapping = true, bool recompute = true);
// Does the copying for this object // Does the copying for this object
virtual void Copy(wxShape& copy); virtual void Copy(wxShape& copy);
@@ -549,11 +549,11 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
bool m_draggable; bool m_draggable;
int m_attachmentMode; // 0 for no attachments, 1 if using normal attachments, int m_attachmentMode; // 0 for no attachments, 1 if using normal attachments,
// 2 for branching attachments // 2 for branching attachments
bool m_spaceAttachments; // TRUE if lines at one side should be spaced bool m_spaceAttachments; // true if lines at one side should be spaced
bool m_fixedWidth; bool m_fixedWidth;
bool m_fixedHeight; bool m_fixedHeight;
bool m_centreResize; // Default is to resize keeping the centre constant (TRUE) bool m_centreResize; // Default is to resize keeping the centre constant (true)
bool m_drawHandles; // Don't draw handles if FALSE, usually TRUE bool m_drawHandles; // Don't draw handles if false, usually true
wxList m_children; // In case it's composite wxList m_children; // In case it's composite
wxShape* m_parent; // In case it's a child wxShape* m_parent; // In case it's a child
int m_formatMode; int m_formatMode;
@@ -589,7 +589,7 @@ class WXDLLIMPEXP_OGL wxPolygonShape: public wxShape
double x2, double y2, double x2, double y2,
double *x3, double *y3); double *x3, double *y3);
bool HitTest(double x, double y, int *attachment, double *distance); bool HitTest(double x, double y, int *attachment, double *distance);
void SetSize(double x, double y, bool recursive = TRUE); void SetSize(double x, double y, bool recursive = true);
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void OnDrawOutline(wxDC& dc, double x, double y, double w, double h); void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
@@ -661,7 +661,7 @@ class WXDLLIMPEXP_OGL wxRectangleShape: public wxShape
double x2, double y2, double x2, double y2,
double *x3, double *y3); double *x3, double *y3);
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void SetSize(double x, double y, bool recursive = TRUE); void SetSize(double x, double y, bool recursive = true);
void SetCornerRadius(double rad); // If > 0, rounded corners void SetCornerRadius(double rad); // If > 0, rounded corners
double GetCornerRadius() const { return m_cornerRadius; } double GetCornerRadius() const { return m_cornerRadius; }
@@ -715,7 +715,7 @@ class WXDLLIMPEXP_OGL wxEllipseShape: public wxShape
double *x3, double *y3); double *x3, double *y3);
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void SetSize(double x, double y, bool recursive = TRUE); void SetSize(double x, double y, bool recursive = true);
#if wxUSE_PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);

2
contrib/include/wx/ogl/basicp.h
View File

@@ -73,7 +73,7 @@ public:
double m_yoffset; double m_yoffset;
wxShape* m_shape; wxShape* m_shape;
wxCursor* m_oldCursor; wxCursor* m_oldCursor;
bool m_eraseObject; // If TRUE, erases object before dragging handle. bool m_eraseObject; // If true, erases object before dragging handle.
/* /*
* Store original top-left, bottom-right coordinates * Store original top-left, bottom-right coordinates

2
contrib/include/wx/ogl/bmpshape.h
View File

@@ -35,7 +35,7 @@ class WXDLLIMPEXP_OGL wxBitmapShape: public wxRectangleShape
// Does the copying for this object // Does the copying for this object
void Copy(wxShape& copy); void Copy(wxShape& copy);
void SetSize(double w, double h, bool recursive = TRUE); void SetSize(double w, double h, bool recursive = true);
inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; } inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
void SetBitmap(const wxBitmap& bm); void SetBitmap(const wxBitmap& bm);
inline void SetFilename(const wxString& f) { m_filename = f; }; inline void SetFilename(const wxString& f) { m_filename = f; };

2
contrib/include/wx/ogl/canvas.h
View File

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_OGL wxShapeCanvas: public wxScrolledWindow
{ {
DECLARE_DYNAMIC_CLASS(wxShapeCanvas) DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
public: public:
wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1, wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBORDER | wxRETAINED, long style = wxBORDER | wxRETAINED,

20
contrib/include/wx/ogl/composit.h
View File

@@ -36,16 +36,16 @@ public:
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void OnDrawContents(wxDC& dc); void OnDrawContents(wxDC& dc);
void OnErase(wxDC& dc); void OnErase(wxDC& dc);
bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE); bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0); void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
void OnBeginDragLeft(double x, double y, int keys, int attachment = 0); void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
void OnEndDragLeft(double x, double y, int keys, int attachment = 0); void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
void OnRightClick(double x, double y, int keys, int attachment = 0); void OnRightClick(double x, double y, int keys, int attachment = 0);
void SetSize(double w, double h, bool recursive = TRUE); void SetSize(double w, double h, bool recursive = true);
// Returns TRUE if it settled down // Returns true if it settled down
bool Recompute(); bool Recompute();
// New members // New members
@@ -69,7 +69,7 @@ public:
// in case it had to find it recursively. // in case it had to find it recursively.
wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL); wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);
// Returns TRUE if something changed // Returns true if something changed
bool Constrain(); bool Constrain();
// Make this composite into a container by creating one wxDivisionShape // Make this composite into a container by creating one wxDivisionShape
@@ -93,7 +93,7 @@ public:
// of the composite that is not in the divisions list. // of the composite that is not in the divisions list.
wxShape *FindContainerImage(); wxShape *FindContainerImage();
// Returns TRUE if division is a descendant of this container // Returns true if division is a descendant of this container
bool ContainsDivision(wxDivisionShape *division); bool ContainsDivision(wxDivisionShape *division);
inline wxList& GetDivisions() const { return (wxList&) m_divisions; } inline wxList& GetDivisions() const { return (wxList&) m_divisions; }
@@ -133,7 +133,7 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void OnDrawContents(wxDC& dc); void OnDrawContents(wxDC& dc);
bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE); bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0); void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
void OnBeginDragLeft(double x, double y, int keys, int attachment = 0); void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
void OnEndDragLeft(double x, double y, int keys, int attachment = 0); void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
@@ -142,7 +142,7 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
// Don't want this kind of composite to resize its subdiagrams, so // Don't want this kind of composite to resize its subdiagrams, so
// override composite's SetSize. // override composite's SetSize.
void SetSize(double w, double h, bool recursive = TRUE); void SetSize(double w, double h, bool recursive = true);
// Similarly for calculating size: it's fixed at whatever SetSize // Similarly for calculating size: it's fixed at whatever SetSize
// set it to, not in terms of children. // set it to, not in terms of children.
@@ -163,12 +163,12 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
// Divide horizontally (wxHORIZONTAL) or vertically (wxVERTICAL) // Divide horizontally (wxHORIZONTAL) or vertically (wxVERTICAL)
bool Divide(int direction); bool Divide(int direction);
// Resize adjoining divisions at the given side. If test is TRUE, // Resize adjoining divisions at the given side. If test is true,
// just see whether it's possible for each adjoining region, // just see whether it's possible for each adjoining region,
// returning FALSE if it's not. // returning false if it's not.
bool ResizeAdjoining(int side, double newPos, bool test); bool ResizeAdjoining(int side, double newPos, bool test);
// Adjust a side, returning FALSE if it's not physically possible. // Adjust a side, returning false if it's not physically possible.
bool AdjustLeft(double left, bool test); bool AdjustLeft(double left, bool test);
bool AdjustTop(double top, bool test); bool AdjustTop(double top, bool test);
bool AdjustRight(double right, bool test); bool AdjustRight(double right, bool test);

2
contrib/include/wx/ogl/constrnt.h
View File

@@ -69,7 +69,7 @@ class WXDLLIMPEXP_OGL wxOGLConstraint: public wxObject
wxOGLConstraint(int type, wxShape *constraining, wxList& constrained); wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
~wxOGLConstraint(); ~wxOGLConstraint();
// Returns TRUE if anything changed // Returns true if anything changed
bool Evaluate(); bool Evaluate();
inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; }; inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
bool Equals(double a, double b); bool Equals(double a, double b);

2
contrib/include/wx/ogl/divided.h
View File

@@ -39,7 +39,7 @@ class WXDLLIMPEXP_OGL wxDividedShape: public wxRectangleShape
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void OnDrawContents(wxDC& dc); void OnDrawContents(wxDC& dc);
void SetSize(double w, double h, bool recursive = TRUE); void SetSize(double w, double h, bool recursive = true);
void MakeControlPoints(); void MakeControlPoints();
void ResetControlPoints(); void ResetControlPoints();

10
contrib/include/wx/ogl/drawn.h
View File

@@ -100,8 +100,8 @@ public:
virtual void SetClippingRect(const wxRect& rect); virtual void SetClippingRect(const wxRect& rect);
virtual void DestroyClippingRect(); virtual void DestroyClippingRect();
virtual void SetPen(wxPen* pen, bool isOutline = FALSE); // TODO: eventually, just store GDI object attributes, not actual 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 SetBrush(wxBrush* brush, bool isFill = false); // pens/brushes etc.
virtual void SetFont(wxFont* font); virtual void SetFont(wxFont* font);
virtual void SetTextColour(const wxColour& colour); virtual void SetTextColour(const wxColour& colour);
virtual void SetBackgroundColour(const wxColour& colour); virtual void SetBackgroundColour(const wxColour& colour);
@@ -155,7 +155,7 @@ class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
// Get current rotation // Get current rotation
inline double GetRotation() const { return m_rotation; } inline double GetRotation() const { return m_rotation; }
void SetSize(double w, double h, bool recursive = TRUE); void SetSize(double w, double h, bool recursive = true);
bool LoadFromMetaFile(const wxString& filename); bool LoadFromMetaFile(const wxString& filename);
inline void SetSaveToFile(bool save) { m_saveToFile = save; } inline void SetSaveToFile(bool save) { m_saveToFile = save; }
@@ -188,8 +188,8 @@ class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
virtual void SetClippingRect(const wxRect& rect); virtual void SetClippingRect(const wxRect& rect);
virtual void DestroyClippingRect(); virtual void DestroyClippingRect();
virtual void SetDrawnPen(wxPen* pen, bool isOutline = FALSE); // TODO: eventually, just store GDI object attributes, not actual 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 SetDrawnBrush(wxBrush* brush, bool isFill = false); // pens/brushes etc.
virtual void SetDrawnFont(wxFont* font); virtual void SetDrawnFont(wxFont* font);
virtual void SetDrawnTextColour(const wxColour& colour); virtual void SetDrawnTextColour(const wxColour& colour);
virtual void SetDrawnBackgroundColour(const wxColour& colour); virtual void SetDrawnBackgroundColour(const wxColour& colour);

6
contrib/include/wx/ogl/drawnp.h
View File

@@ -70,9 +70,9 @@ public:
#endif #endif
inline int GetOp() const { return m_op; } inline int GetOp() const { return m_op; }
// Draw an outline using the current operation. By default, return FALSE (not drawn) // Draw an outline using the current operation. By default, return false (not drawn)
virtual bool OnDrawOutline(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h), virtual bool OnDrawOutline(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h),
double WXUNUSED(oldW), double WXUNUSED(oldH)) { return FALSE; } double WXUNUSED(oldW), double WXUNUSED(oldH)) { return false; }
// Get the perimeter point using this data // Get the perimeter point using this data
virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1), virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
@@ -80,7 +80,7 @@ public:
double *WXUNUSED(x3), double *WXUNUSED(y3), double *WXUNUSED(x3), double *WXUNUSED(y3),
double WXUNUSED(xOffset), double WXUNUSED(yOffset), double WXUNUSED(xOffset), double WXUNUSED(yOffset),
int WXUNUSED(attachmentMode)) int WXUNUSED(attachmentMode))
{ return FALSE; } { return false; }
protected: protected:
int m_op; int m_op;

16
contrib/include/wx/ogl/lines.h
View File

@@ -83,7 +83,7 @@ class WXDLLIMPEXP_OGL wxArrowHead: public wxObject
double m_spacing; // Spacing from the last arrowhead double m_spacing; // Spacing from the last arrowhead
double m_arrowSize; // Length of arrowhead double m_arrowSize; // Length of arrowhead
wxString m_arrowName; // Name of arrow 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 wxPseudoMetaFile* m_metaFile; // Pseudo metafile if this is a custom arrowhead
long m_id; // identifier long m_id; // identifier
}; };
@@ -102,14 +102,14 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
// correct position // correct position
// moveControlPoints must be disabled when a control point is being // moveControlPoints must be disabled when a control point is being
// dragged. // dragged.
void OnMoveLink(wxDC& dc, bool moveControlPoints = 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); bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void OnDrawContents(wxDC& dc); void OnDrawContents(wxDC& dc);
void OnDrawControlPoints(wxDC& dc); void OnDrawControlPoints(wxDC& dc);
void OnEraseControlPoints(wxDC& dc); void OnEraseControlPoints(wxDC& dc);
void OnErase(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 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); 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); void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
@@ -176,9 +176,9 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0); virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
// Override select, to create/delete temporary label-moving objects // 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 void SetSpline(bool spl) { m_isSpline = spl; }
inline bool IsSpline() const { return m_isSpline; } inline bool IsSpline() const { return m_isSpline; }
@@ -204,7 +204,7 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
// This is really to distinguish between lines and other images. // This is really to distinguish between lines and other images.
// For lines, want to pass drag to canvas, since lines tend to prevent // For lines, want to pass drag to canvas, since lines tend to prevent
// dragging on a canvas (they get in the way.) // 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 // Does the copying for this object
void Copy(wxShape& copy); void Copy(wxShape& copy);
@@ -221,7 +221,7 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
// E.g. reference list: a b c d e // E.g. reference list: a b c d e
// Current line list: a d // Current line list: a d
// Add c, then line list is: a c 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 // 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 ordering for any one of the 3 positions. So we don't check
// the reference list for arrowhead position. // the reference list for arrowhead position.

2
contrib/include/wx/ogl/linesp.h
View File

@@ -68,7 +68,7 @@ class WXDLLIMPEXP_OGL wxLabelShape: public wxRectangleShape
void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0); void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0); void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE); bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
public: public:
wxLineShape* m_lineShape; wxLineShape* m_lineShape;

80
contrib/samples/ogl/ogledit/doc.cpp
View File

@@ -49,7 +49,7 @@ DiagramDocument::~DiagramDocument(void)
bool DiagramDocument::OnCloseDocument(void) bool DiagramDocument::OnCloseDocument(void)
{ {
diagram.DeleteAllShapes(); diagram.DeleteAllShapes();
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -130,7 +130,7 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy, DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
bool sel, wxShape *theShape, wxShape *fs, wxShape *ts): bool sel, wxShape *theShape, wxShape *fs, wxShape *ts):
wxCommand(TRUE, name) wxCommand(true, name)
{ {
doc = ddoc; doc = ddoc;
cmd = command; cmd = command;
@@ -143,11 +143,11 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
x = xx; x = xx;
y = yy; y = yy;
selected = sel; selected = sel;
deleteShape = FALSE; deleteShape = false;
} }
DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape): DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape):
wxCommand(TRUE, name) wxCommand(true, name)
{ {
doc = ddoc; doc = ddoc;
cmd = command; cmd = command;
@@ -157,14 +157,14 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
shapeInfo = NULL; shapeInfo = NULL;
x = 0.0; x = 0.0;
y = 0.0; y = 0.0;
selected = FALSE; selected = false;
deleteShape = FALSE; deleteShape = false;
shapeBrush = backgroundColour; shapeBrush = backgroundColour;
shapePen = NULL; shapePen = NULL;
} }
DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape): DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape):
wxCommand(TRUE, name) wxCommand(true, name)
{ {
doc = ddoc; doc = ddoc;
cmd = command; cmd = command;
@@ -174,8 +174,8 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
shapeInfo = NULL; shapeInfo = NULL;
x = 0.0; x = 0.0;
y = 0.0; y = 0.0;
selected = FALSE; selected = false;
deleteShape = FALSE; deleteShape = false;
shapeBrush = NULL; shapeBrush = NULL;
shapePen = NULL; shapePen = NULL;
shapeLabel = lab; shapeLabel = lab;
@@ -198,9 +198,9 @@ bool DiagramCommand::Do(void)
{ {
if (shape) if (shape)
{ {
deleteShape = TRUE; deleteShape = true;
shape->Select(FALSE); shape->Select(false);
// Generate commands to explicitly remove each connected line. // Generate commands to explicitly remove each connected line.
RemoveLines(shape); RemoveLines(shape);
@@ -214,7 +214,7 @@ bool DiagramCommand::Do(void)
} }
shape->Unlink(); shape->Unlink();
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
@@ -230,14 +230,14 @@ bool DiagramCommand::Do(void)
theShape = (wxShape *)shapeInfo->CreateObject(); theShape = (wxShape *)shapeInfo->CreateObject();
theShape->AssignNewIds(); theShape->AssignNewIds();
theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString)); theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
theShape->SetCentreResize(FALSE); theShape->SetCentreResize(false);
theShape->SetPen(wxBLACK_PEN); theShape->SetPen(wxBLACK_PEN);
theShape->SetBrush(wxCYAN_BRUSH); theShape->SetBrush(wxCYAN_BRUSH);
theShape->SetSize(60, 60); theShape->SetSize(60, 60);
} }
doc->GetDiagram()->AddShape(theShape); doc->GetDiagram()->AddShape(theShape);
theShape->Show(TRUE); theShape->Show(true);
wxClientDC dc(theShape->GetCanvas()); wxClientDC dc(theShape->GetCanvas());
theShape->GetCanvas()->PrepareDC(dc); theShape->GetCanvas()->PrepareDC(dc);
@@ -245,9 +245,9 @@ bool DiagramCommand::Do(void)
theShape->Move(dc, x, y); theShape->Move(dc, x, y);
shape = theShape; shape = theShape;
deleteShape = FALSE; deleteShape = false;
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
break; break;
} }
@@ -276,7 +276,7 @@ bool DiagramCommand::Do(void)
fromShape->AddLine((wxLineShape *)theShape, toShape); fromShape->AddLine((wxLineShape *)theShape, toShape);
theShape->Show(TRUE); theShape->Show(true);
wxClientDC dc(theShape->GetCanvas()); wxClientDC dc(theShape->GetCanvas());
theShape->GetCanvas()->PrepareDC(dc); theShape->GetCanvas()->PrepareDC(dc);
@@ -287,9 +287,9 @@ bool DiagramCommand::Do(void)
toShape->Move(dc, toShape->GetX(), toShape->GetY()); toShape->Move(dc, toShape->GetX(), toShape->GetY());
shape = theShape; shape = theShape;
deleteShape = FALSE; deleteShape = false;
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
break; break;
} }
@@ -305,7 +305,7 @@ bool DiagramCommand::Do(void)
shapeBrush = oldBrush; shapeBrush = oldBrush;
shape->Draw(dc); shape->Draw(dc);
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
@@ -326,14 +326,14 @@ bool DiagramCommand::Do(void)
shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label); shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
shape->Draw(dc); shape->Draw(dc);
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
break; break;
} }
} }
return TRUE; return true;
} }
bool DiagramCommand::Undo(void) bool DiagramCommand::Undo(void)
@@ -345,7 +345,7 @@ bool DiagramCommand::Undo(void)
if (shape) if (shape)
{ {
doc->GetDiagram()->AddShape(shape); doc->GetDiagram()->AddShape(shape);
shape->Show(TRUE); shape->Show(true);
if (shape->IsKindOf(CLASSINFO(wxLineShape))) if (shape->IsKindOf(CLASSINFO(wxLineShape)))
{ {
@@ -354,11 +354,11 @@ bool DiagramCommand::Undo(void)
fromShape->AddLine(lineShape, toShape); fromShape->AddLine(lineShape, toShape);
} }
if (selected) if (selected)
shape->Select(TRUE); shape->Select(true);
deleteShape = FALSE; deleteShape = false;
} }
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
break; break;
} }
@@ -370,12 +370,12 @@ bool DiagramCommand::Undo(void)
wxClientDC dc(shape->GetCanvas()); wxClientDC dc(shape->GetCanvas());
shape->GetCanvas()->PrepareDC(dc); shape->GetCanvas()->PrepareDC(dc);
shape->Select(FALSE, &dc); shape->Select(false, &dc);
doc->GetDiagram()->RemoveShape(shape); doc->GetDiagram()->RemoveShape(shape);
shape->Unlink(); shape->Unlink();
deleteShape = TRUE; deleteShape = true;
} }
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
break; break;
} }
@@ -391,7 +391,7 @@ bool DiagramCommand::Undo(void)
shapeBrush = oldBrush; shapeBrush = oldBrush;
shape->Draw(dc); shape->Draw(dc);
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
break; break;
@@ -411,14 +411,14 @@ bool DiagramCommand::Undo(void)
shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label); shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
shape->Draw(dc); shape->Draw(dc);
doc->Modify(TRUE); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
break; break;
} }
} }
return TRUE; return true;
} }
// Remove each individual line connected to a shape by sending a command. // Remove each individual line connected to a shape by sending a command.
@@ -448,13 +448,13 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
// Selection is a concept the library knows about // Selection is a concept the library knows about
if (GetShape()->Selected()) if (GetShape()->Selected())
{ {
GetShape()->Select(FALSE, &dc); GetShape()->Select(false, &dc);
GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
} }
else else
{ {
// Ensure no other shape is selected, to simplify Undo/Redo code // Ensure no other shape is selected, to simplify Undo/Redo code
bool redraw = FALSE; bool redraw = false;
wxNode *node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst(); wxNode *node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
while (node) while (node)
{ {
@@ -463,13 +463,13 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
{ {
if (eachShape->Selected()) if (eachShape->Selected())
{ {
eachShape->Select(FALSE, &dc); eachShape->Select(false, &dc);
redraw = TRUE; redraw = true;
} }
} }
node = node->GetNext(); node = node->GetNext();
} }
GetShape()->Select(TRUE, &dc); GetShape()->Select(true, &dc);
if (redraw) if (redraw)
GetShape()->GetCanvas()->Redraw(dc); GetShape()->GetCanvas()->Redraw(dc);
} }
@@ -535,7 +535,7 @@ void MyEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int WX
{ {
canvas->view->GetDocument()->GetCommandProcessor()->Submit( canvas->view->GetDocument()->GetCommandProcessor()->Submit(
new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape), new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),
0.0, 0.0, FALSE, NULL, GetShape(), otherShape)); 0.0, 0.0, false, NULL, GetShape(), otherShape));
} }
} }
@@ -558,7 +558,7 @@ bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
wxDiagram::OnShapeSave(db, shape, expr); wxDiagram::OnShapeSave(db, shape, expr);
MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler(); MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
expr.AddAttributeValueString(_T("label"), handler->label); expr.AddAttributeValueString(_T("label"), handler->label);
return TRUE; return true;
} }
bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr) bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
@@ -571,7 +571,7 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
if (label) if (label)
delete[] label; delete[] label;
return TRUE; return true;
} }
#endif #endif

2
contrib/samples/ogl/ogledit/doc.h
View File

@@ -164,7 +164,7 @@ class DiagramCommand: public wxCommand
public: public:
// Multi-purpose constructor for creating, deleting shapes // Multi-purpose constructor for creating, deleting shapes
DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL, DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
double x = 0.0, double y = 0.0, bool sel = FALSE, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL); double x = 0.0, double y = 0.0, bool sel = false, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
// Property-changing command constructors // Property-changing command constructors
DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape); DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);

8
contrib/samples/ogl/ogledit/ogledit.cpp
View File

@@ -121,9 +121,9 @@ bool MyApp::OnInit(void)
frame->CreateStatusBar(1); frame->CreateStatusBar(1);
frame->Centre(wxBOTH); frame->Centre(wxBOTH);
frame->Show(TRUE); frame->Show(true);
return TRUE; return true;
} }
int MyApp::OnExit(void) int MyApp::OnExit(void)
@@ -147,7 +147,7 @@ END_EVENT_TABLE()
MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
const wxPoint& pos, const wxSize& size, long type): const wxPoint& pos, const wxSize& size, long type):
wxDocParentFrame(manager, frame, -1, title, pos, size, type) wxDocParentFrame(manager, frame, wxID_ANY, title, pos, size, type)
{ {
canvas = NULL; canvas = NULL;
palette = NULL; palette = NULL;
@@ -197,7 +197,7 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
parent->GetClientSize(&width, &height); parent->GetClientSize(&width, &height);
// Non-retained canvas // Non-retained canvas
MyCanvas *canvas = new MyCanvas(view, parent, -1, wxPoint(0, 0), wxSize(width, height), 0); MyCanvas *canvas = new MyCanvas(view, parent, wxID_ANY, wxPoint(0, 0), wxSize(width, height), 0);
canvas->SetCursor(wxCursor(wxCURSOR_HAND)); canvas->SetCursor(wxCursor(wxCURSOR_HAND));
// Give it scrollbars // Give it scrollbars

20
contrib/samples/ogl/ogledit/palette.cpp
View File

@@ -49,7 +49,7 @@
EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size, EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style): long style):
TOOLPALETTECLASS(parent, -1, pos, size, style) TOOLPALETTECLASS(parent, wxID_ANY, pos, size, style)
{ {
currentlySelected = -1; currentlySelected = -1;
} }
@@ -58,7 +58,7 @@ bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
{ {
// BEGIN mutual exclusivity code // BEGIN mutual exclusivity code
if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected)) if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected))
ToggleTool(currentlySelected, FALSE); ToggleTool(currentlySelected, false);
if (toggled) if (toggled)
currentlySelected = toolIndex; currentlySelected = toolIndex;
@@ -66,7 +66,7 @@ bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
currentlySelected = -1; currentlySelected = -1;
// END mutual exclusivity code // END mutual exclusivity code
return TRUE; return true;
} }
void EditorToolPalette::OnMouseEnter(int WXUNUSED(toolIndex)) void EditorToolPalette::OnMouseEnter(int WXUNUSED(toolIndex))
@@ -96,21 +96,21 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
wxBitmap PaletteArrow(arrow_xpm); wxBitmap PaletteArrow(arrow_xpm);
#endif #endif
EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxSize(-1, -1), EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
wxTB_VERTICAL); wxTB_VERTICAL);
palette->SetMargins(2, 2); palette->SetMargins(2, 2);
palette->SetToolBitmapSize(wxSize(22, 22)); palette->SetToolBitmapSize(wxSize(22, 22));
palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer")); palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Pointer"));
palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 1")); palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 1"));
palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 2")); palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 2"));
palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 3")); palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 3"));
palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 4")); palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 4"));
palette->Realize(); palette->Realize();
palette->ToggleTool(PALETTE_ARROW, TRUE); palette->ToggleTool(PALETTE_ARROW, true);
palette->currentlySelected = PALETTE_ARROW; palette->currentlySelected = PALETTE_ARROW;
return palette; return palette;
} }

16
contrib/samples/ogl/ogledit/view.cpp
View File

@@ -52,7 +52,7 @@ bool DiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
canvas->view = this; canvas->view = this;
SetFrame(frame); SetFrame(frame);
Activate(TRUE); Activate(true);
// Initialize the edit menu Undo and Redo items // Initialize the edit menu Undo and Redo items
doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu); doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
@@ -63,10 +63,10 @@ bool DiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
shapeCanvas->SetDiagram(diagramDoc->GetDiagram()); shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
diagramDoc->GetDiagram()->SetCanvas(shapeCanvas); diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);
return TRUE; return true;
} }
#define CENTER FALSE // Place the drawing to the center of the page #define CENTER false // Place the drawing to the center of the page
// Sneakily gets used for default print/preview // Sneakily gets used for default print/preview
@@ -152,7 +152,7 @@ void DiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
bool DiagramView::OnClose(bool WXUNUSED(deleteWindow)) bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))
{ {
if (!GetDocument()->Close()) if (!GetDocument()->Close())
return FALSE; return false;
DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument(); DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument();
diagramDoc->GetDiagram()->SetCanvas(NULL); diagramDoc->GetDiagram()->SetCanvas(NULL);
@@ -168,9 +168,9 @@ bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))
SetFrame(NULL); SetFrame(NULL);
Activate(FALSE); Activate(false);
return TRUE; return true;
} }
wxShape *DiagramView::FindSelectedShape(void) wxShape *DiagramView::FindSelectedShape(void)
@@ -197,7 +197,7 @@ void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
wxShape *theShape = FindSelectedShape(); wxShape *theShape = FindSelectedShape();
if (theShape) if (theShape)
doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, TRUE, theShape)); doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, true, theShape));
} }
void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event)) void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
@@ -208,7 +208,7 @@ void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
if (theShape) if (theShape)
{ {
wxColourData data; wxColourData data;
data.SetChooseFull(TRUE); data.SetChooseFull(true);
data.SetColour(theShape->GetBrush()->GetColour()); data.SetColour(theShape->GetBrush()->GetColour());
wxColourDialog *dialog = new wxColourDialog(frame, &data); wxColourDialog *dialog = new wxColourDialog(frame, &data);

4
contrib/samples/ogl/ogledit/view.h
View File

@@ -26,7 +26,7 @@ class MyCanvas: public wxShapeCanvas
public: public:
wxView *view; wxView *view;
MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = -1, MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxRETAINED); long style = wxRETAINED);
~MyCanvas(void); ~MyCanvas(void);
@@ -62,7 +62,7 @@ class DiagramView: public wxView
bool OnCreate(wxDocument *doc, long flags); bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc); void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL); void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose(bool deleteWindow = TRUE); bool OnClose(bool deleteWindow = true);
wxShape *FindSelectedShape(void); wxShape *FindSelectedShape(void);

24
contrib/samples/ogl/studio/cspalette.cpp
View File

@@ -59,7 +59,7 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
{ {
// BEGIN mutual exclusivity code // BEGIN mutual exclusivity code
if (toggled && (m_currentlySelected != -1) && (toolIndex != m_currentlySelected)) if (toggled && (m_currentlySelected != -1) && (toolIndex != m_currentlySelected))
ToggleTool(m_currentlySelected, FALSE); ToggleTool(m_currentlySelected, false);
if (toggled) if (toggled)
m_currentlySelected = toolIndex; m_currentlySelected = toolIndex;
@@ -67,7 +67,7 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
m_currentlySelected = -1; m_currentlySelected = -1;
// END mutual exclusivity code // END mutual exclusivity code
return TRUE; return true;
} }
void csEditorToolPalette::OnMouseEnter(int toolIndex) void csEditorToolPalette::OnMouseEnter(int toolIndex)
@@ -93,10 +93,10 @@ void csEditorToolPalette::SetSelection(int sel)
{ {
if ((sel != m_currentlySelected) && (m_currentlySelected != -1)) if ((sel != m_currentlySelected) && (m_currentlySelected != -1))
{ {
ToggleTool(m_currentlySelected, FALSE); ToggleTool(m_currentlySelected, false);
} }
m_currentlySelected = sel; m_currentlySelected = sel;
ToggleTool(m_currentlySelected, TRUE); ToggleTool(m_currentlySelected, true);
} }
bool csApp::CreatePalette(wxFrame *parent) bool csApp::CreatePalette(wxFrame *parent)
@@ -107,11 +107,11 @@ bool csApp::CreatePalette(wxFrame *parent)
win->SetOrientation(wxLAYOUT_HORIZONTAL); win->SetOrientation(wxLAYOUT_HORIZONTAL);
win->SetAlignment(wxLAYOUT_TOP); win->SetAlignment(wxLAYOUT_TOP);
win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
win->SetSashVisible(wxSASH_BOTTOM, TRUE); win->SetSashVisible(wxSASH_BOTTOM, true);
m_diagramPaletteSashWindow = win; m_diagramPaletteSashWindow = win;
m_diagramPaletteSashWindow->Show(FALSE); m_diagramPaletteSashWindow->Show(false);
// Load palette bitmaps // Load palette bitmaps
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -124,14 +124,14 @@ bool csApp::CreatePalette(wxFrame *parent)
wxSize toolBitmapSize(22, 22); wxSize toolBitmapSize(22, 22);
#endif #endif
csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxSize(-1, -1), wxTB_HORIZONTAL|wxNO_BORDER); csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER);
palette->SetMargins(2, 2); palette->SetMargins(2, 2);
palette->SetToolBitmapSize(toolBitmapSize); palette->SetToolBitmapSize(toolBitmapSize);
palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer")); palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Pointer"));
palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, _T("Text")); palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Text"));
wxChar** symbols = new wxChar*[20]; wxChar** symbols = new wxChar*[20];
int noSymbols = 0; int noSymbols = 0;
@@ -171,7 +171,7 @@ bool csApp::CreatePalette(wxFrame *parent)
if (symbol) if (symbol)
{ {
wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize); wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, TRUE, 0, -1, NULL, symbol->GetName()); palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, symbol->GetName());
delete bitmap; delete bitmap;
} }
@@ -185,7 +185,7 @@ bool csApp::CreatePalette(wxFrame *parent)
csSymbol* symbol = (csSymbol*) node->Data(); csSymbol* symbol = (csSymbol*) node->Data();
wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize); wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, TRUE, 0, -1, NULL, symbol->GetName()); palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, symbol->GetName());
delete bitmap; delete bitmap;
@@ -198,6 +198,6 @@ bool csApp::CreatePalette(wxFrame *parent)
palette->SetSelection(PALETTE_ARROW); palette->SetSelection(PALETTE_ARROW);
m_diagramPalette = palette; m_diagramPalette = palette;
return TRUE; return true;
} }

2
contrib/samples/ogl/studio/cspalette.h
View File

@@ -37,7 +37,7 @@ class csEditorToolPalette: public TOOLPALETTECLASS
{ {
public: public:
csEditorToolPalette(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, csEditorToolPalette(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_VERTICAL); long style = wxTB_VERTICAL);

24
contrib/samples/ogl/studio/csprint.cpp
View File

@@ -45,14 +45,14 @@ bool wxDiagramClipboard::Copy(wxDiagram* diagram)
{ {
DeleteAllShapes(); DeleteAllShapes();
return DoCopy(diagram, this, FALSE, NULL); return DoCopy(diagram, this, false, NULL);
} }
// Copy contents to the diagram, with new ids. // Copy contents to the diagram, with new ids.
bool wxDiagramClipboard::Paste(wxDiagram* diagram, wxDC* dc, int offsetX, int offsetY) bool wxDiagramClipboard::Paste(wxDiagram* diagram, wxDC* dc, int offsetX, int offsetY)
{ {
return DoCopy(this, diagram, TRUE, dc, offsetX, offsetY); return DoCopy(this, diagram, true, dc, offsetX, offsetY);
} }
// Universal copy function (to or from clipboard). // Universal copy function (to or from clipboard).
@@ -161,7 +161,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
OnEndCopy(diagramTo); OnEndCopy(diagramTo);
return TRUE; return true;
} }
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -194,7 +194,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
wxChar buf[200]; wxChar buf[200];
wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10)); wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
wxMessageBox(buf, _T("Clipboard copy problem")); wxMessageBox(buf, _T("Clipboard copy problem"));
return FALSE; return false;
} }
wxMemoryDC memDC; wxMemoryDC memDC;
@@ -248,10 +248,10 @@ bool wxDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD
if (dc && (diagramTo != this)) if (dc && (diagramTo != this))
{ {
newShape->Select(TRUE, dc); newShape->Select(true, dc);
} }
return TRUE; return true;
} }
/* /*
@@ -265,24 +265,24 @@ bool csDiagramClipboard::OnStartCopy(wxDiagram* diagramTo)
{ {
// Do nothing if copying to the clipboard // Do nothing if copying to the clipboard
if (diagramTo == this) if (diagramTo == this)
return TRUE; return true;
// Deselect all objects initially. // Deselect all objects initially.
csDiagram* diagram = (csDiagram*) diagramTo; csDiagram* diagram = (csDiagram*) diagramTo;
csDiagramDocument* doc = diagram->GetDocument(); csDiagramDocument* doc = diagram->GetDocument();
((csDiagramView*)doc->GetFirstView())->SelectAll(FALSE); ((csDiagramView*)doc->GetFirstView())->SelectAll(false);
m_currentCmd = new csDiagramCommand(_T("Paste"), doc); m_currentCmd = new csDiagramCommand(_T("Paste"), doc);
return TRUE; return true;
} }
bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo) bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
{ {
// Do nothing if copying to the clipboard // Do nothing if copying to the clipboard
if (diagramTo == this) if (diagramTo == this)
return TRUE; return true;
csDiagram* diagram = (csDiagram*) diagramTo; csDiagram* diagram = (csDiagram*) diagramTo;
csDiagramDocument* doc = diagram->GetDocument(); csDiagramDocument* doc = diagram->GetDocument();
@@ -299,7 +299,7 @@ bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
m_currentCmd = NULL; m_currentCmd = NULL;
} }
} }
return TRUE; return true;
} }
// Use the command framework to add the shapes, if we're copying to a diagram and // Use the command framework to add the shapes, if we're copying to a diagram and
@@ -321,7 +321,7 @@ bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD
m_currentCmd->AddState(new csCommandState(ID_CS_ADD_SHAPE_SELECT, newShape, NULL)); m_currentCmd->AddState(new csCommandState(ID_CS_ADD_SHAPE_SELECT, newShape, NULL));
} }
return TRUE; return true;
} }

16
contrib/samples/ogl/studio/dialogs.cpp
View File

@@ -90,7 +90,7 @@ END_EVENT_TABLE()
// For 400x400 settings dialog, size your panels to about 375x325 in dialog editor // For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
csSettingsDialog::csSettingsDialog(wxWindow* parent): csSettingsDialog::csSettingsDialog(wxWindow* parent):
wxDialog(parent, -1, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT)) wxDialog(parent, wxID_ANY, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
{ {
m_generalSettings = NULL; m_generalSettings = NULL;
m_diagramSettings = NULL; m_diagramSettings = NULL;
@@ -105,7 +105,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent):
#endif #endif
wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog")); wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
wxASSERT_MSG( (success), _T("Could not load general settings panel.")); wxASSERT_MSG( (success), _T("Could not load general settings panel."));
m_notebook->AddPage(m_generalSettings, _T("General"), TRUE); m_notebook->AddPage(m_generalSettings, _T("General"), true);
m_diagramSettings = new wxPanel; m_diagramSettings = new wxPanel;
@@ -181,7 +181,7 @@ bool csSettingsDialog::TransferDataToWindow()
str.Printf(_T("%d"), wxGetApp().GetGridSpacing()); str.Printf(_T("%d"), wxGetApp().GetGridSpacing());
gridSpacing->SetValue(str); gridSpacing->SetValue(str);
return TRUE; return true;
} }
bool csSettingsDialog::TransferDataFromWindow() bool csSettingsDialog::TransferDataFromWindow()
@@ -201,7 +201,7 @@ bool csSettingsDialog::TransferDataFromWindow()
if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED) if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED)
{ {
wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION); wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION);
return FALSE; return false;
} }
// Apply settings to all open diagram documents // Apply settings to all open diagram documents
@@ -219,12 +219,12 @@ bool csSettingsDialog::TransferDataFromWindow()
{ {
case csGRID_STYLE_NONE: case csGRID_STYLE_NONE:
{ {
diagram->SetSnapToGrid(FALSE); diagram->SetSnapToGrid(false);
break; break;
} }
case csGRID_STYLE_INVISIBLE: case csGRID_STYLE_INVISIBLE:
{ {
diagram->SetSnapToGrid(TRUE); diagram->SetSnapToGrid(true);
break; break;
} }
case csGRID_STYLE_DOTTED: case csGRID_STYLE_DOTTED:
@@ -237,7 +237,7 @@ bool csSettingsDialog::TransferDataFromWindow()
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
/* /*
@@ -258,7 +258,7 @@ END_EVENT_TABLE()
csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title, csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,
wxPanel* attributeDialog, const wxString& attributeDialogName): wxPanel* attributeDialog, const wxString& attributeDialogName):
wxDialog(parent, -1, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT)) wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
{ {
m_attributeDialog = attributeDialog; m_attributeDialog = attributeDialog;
m_alternativeAttributeDialog = NULL; m_alternativeAttributeDialog = NULL;

76
contrib/samples/ogl/studio/doc.cpp
View File

@@ -50,13 +50,13 @@ csDiagramDocument::~csDiagramDocument()
bool csDiagramDocument::OnCloseDocument() bool csDiagramDocument::OnCloseDocument()
{ {
m_diagram.DeleteAllShapes(); m_diagram.DeleteAllShapes();
return TRUE; return true;
} }
bool csDiagramDocument::OnSaveDocument(const wxString& file) bool csDiagramDocument::OnSaveDocument(const wxString& file)
{ {
if (file == wxEmptyString) if (file == wxEmptyString)
return FALSE; return false;
if (!m_diagram.SaveFile(file)) if (!m_diagram.SaveFile(file))
{ {
@@ -68,18 +68,18 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
(void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, (void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
GetDocumentWindow()); GetDocumentWindow());
return FALSE; return false;
} }
Modify(FALSE); Modify(false);
SetFilename(file); SetFilename(file);
return TRUE; return true;
} }
bool csDiagramDocument::OnOpenDocument(const wxString& file) bool csDiagramDocument::OnOpenDocument(const wxString& file)
{ {
if (!OnSaveModified()) if (!OnSaveModified())
return FALSE; return false;
wxString msgTitle; wxString msgTitle;
if (wxTheApp->GetAppName() != wxEmptyString) if (wxTheApp->GetAppName() != wxEmptyString)
@@ -92,13 +92,13 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
{ {
(void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, (void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
GetDocumentWindow()); GetDocumentWindow());
return FALSE; return false;
} }
SetFilename(file, TRUE); SetFilename(file, true);
Modify(FALSE); Modify(false);
UpdateAllViews(); UpdateAllViews();
return TRUE; return true;
} }
@@ -108,7 +108,7 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc, csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
csCommandState* onlyState): csCommandState* onlyState):
wxCommand(TRUE, name) wxCommand(true, name)
{ {
m_doc = doc; m_doc = doc;
@@ -190,10 +190,10 @@ bool csDiagramCommand::Do()
{ {
csCommandState* state = (csCommandState*) node->GetData(); csCommandState* state = (csCommandState*) node->GetData();
if (!state->Do()) if (!state->Do())
return FALSE; return false;
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
bool csDiagramCommand::Undo() bool csDiagramCommand::Undo()
@@ -205,10 +205,10 @@ bool csDiagramCommand::Undo()
{ {
csCommandState* state = (csCommandState*) node->GetData(); csCommandState* state = (csCommandState*) node->GetData();
if (!state->Undo()) if (!state->Undo())
return FALSE; return false;
node = node->GetPrevious(); node = node->GetPrevious();
} }
return TRUE; return true;
} }
csCommandState::csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas) csCommandState::csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas)
@@ -264,8 +264,8 @@ bool csCommandState::Do()
m_linePositionTo = lineTo->GetLinePosition(lineShape); m_linePositionTo = lineTo->GetLinePosition(lineShape);
} }
m_shapeOnCanvas->Select(FALSE); m_shapeOnCanvas->Select(false);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, FALSE); ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
m_shapeOnCanvas->Unlink(); m_shapeOnCanvas->Unlink();
@@ -288,7 +288,7 @@ bool csCommandState::Do()
lineTo->MoveLinks(dc); lineTo->MoveLinks(dc);
} }
m_doc->Modify(TRUE); m_doc->Modify(true);
m_doc->UpdateAllViews(); m_doc->UpdateAllViews();
break; break;
} }
@@ -309,7 +309,7 @@ bool csCommandState::Do()
m_savedState = NULL; m_savedState = NULL;
m_doc->GetDiagram()->AddShape(m_shapeOnCanvas); m_doc->GetDiagram()->AddShape(m_shapeOnCanvas);
m_shapeOnCanvas->Show(TRUE); m_shapeOnCanvas->Show(true);
wxClientDC dc(m_shapeOnCanvas->GetCanvas()); wxClientDC dc(m_shapeOnCanvas->GetCanvas());
m_shapeOnCanvas->GetCanvas()->PrepareDC(dc); m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
@@ -321,11 +321,11 @@ bool csCommandState::Do()
if (m_cmd == ID_CS_ADD_SHAPE_SELECT) if (m_cmd == ID_CS_ADD_SHAPE_SELECT)
{ {
m_shapeOnCanvas->Select(TRUE, &dc); m_shapeOnCanvas->Select(true, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, TRUE); ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
} }
m_doc->Modify(TRUE); m_doc->Modify(true);
m_doc->UpdateAllViews(); m_doc->UpdateAllViews();
break; break;
} }
@@ -348,7 +348,7 @@ bool csCommandState::Do()
lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(), lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo()); lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());
lineShape->Show(TRUE); lineShape->Show(true);
wxClientDC dc(lineShape->GetCanvas()); wxClientDC dc(lineShape->GetCanvas());
lineShape->GetCanvas()->PrepareDC(dc); lineShape->GetCanvas()->PrepareDC(dc);
@@ -360,11 +360,11 @@ bool csCommandState::Do()
if (m_cmd == ID_CS_ADD_LINE_SELECT) if (m_cmd == ID_CS_ADD_LINE_SELECT)
{ {
lineShape->Select(TRUE, &dc); lineShape->Select(true, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, TRUE); ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
} }
m_doc->Modify(TRUE); m_doc->Modify(true);
m_doc->UpdateAllViews(); m_doc->UpdateAllViews();
break; break;
} }
@@ -401,7 +401,7 @@ bool csCommandState::Do()
bool isSelected = m_shapeOnCanvas->Selected(); bool isSelected = m_shapeOnCanvas->Selected();
if (isSelected) if (isSelected)
m_shapeOnCanvas->Select(FALSE, & dc); m_shapeOnCanvas->Select(false, & dc);
if (m_cmd == ID_CS_SIZE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE || if (m_cmd == ID_CS_SIZE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
m_cmd == ID_CS_CHANGE_LINE_ORDERING || m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT) m_cmd == ID_CS_CHANGE_LINE_ORDERING || m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
@@ -454,11 +454,11 @@ bool csCommandState::Do()
m_shapeOnCanvas->SetSize(width, height); m_shapeOnCanvas->SetSize(width, height);
m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY()); m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
m_shapeOnCanvas->Show(TRUE); m_shapeOnCanvas->Show(true);
// Recursively redraw links if we have a composite. // Recursively redraw links if we have a composite.
if (m_shapeOnCanvas->GetChildren().GetCount() > 0) if (m_shapeOnCanvas->GetChildren().GetCount() > 0)
m_shapeOnCanvas->DrawLinks(dc, -1, TRUE); m_shapeOnCanvas->DrawLinks(dc, -1, true);
m_shapeOnCanvas->GetEventHandler()->OnEndSize(width, height); m_shapeOnCanvas->GetEventHandler()->OnEndSize(width, height);
} }
@@ -474,15 +474,15 @@ bool csCommandState::Do()
} }
if (isSelected) if (isSelected)
m_shapeOnCanvas->Select(TRUE, & dc); m_shapeOnCanvas->Select(true, & dc);
m_doc->Modify(TRUE); m_doc->Modify(true);
m_doc->UpdateAllViews(); m_doc->UpdateAllViews();
break; break;
} }
} }
return TRUE; return true;
} }
bool csCommandState::Undo() bool csCommandState::Undo()
@@ -514,9 +514,9 @@ bool csCommandState::Undo()
lineShape->GetTo()->MoveLinks(dc); lineShape->GetTo()->MoveLinks(dc);
} }
m_shapeOnCanvas->Show(TRUE); m_shapeOnCanvas->Show(true);
m_doc->Modify(TRUE); m_doc->Modify(true);
m_doc->UpdateAllViews(); m_doc->UpdateAllViews();
break; break;
} }
@@ -547,8 +547,8 @@ bool csCommandState::Undo()
wxClientDC dc(m_shapeOnCanvas->GetCanvas()); wxClientDC dc(m_shapeOnCanvas->GetCanvas());
m_shapeOnCanvas->GetCanvas()->PrepareDC(dc); m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
m_shapeOnCanvas->Select(FALSE, &dc); m_shapeOnCanvas->Select(false, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, FALSE); ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas); m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
m_shapeOnCanvas->Unlink(); // Unlinks the line, if it is a line m_shapeOnCanvas->Unlink(); // Unlinks the line, if it is a line
@@ -564,7 +564,7 @@ bool csCommandState::Undo()
m_savedState = m_shapeOnCanvas; m_savedState = m_shapeOnCanvas;
m_shapeOnCanvas = NULL; m_shapeOnCanvas = NULL;
m_doc->Modify(TRUE); m_doc->Modify(true);
m_doc->UpdateAllViews(); m_doc->UpdateAllViews();
break; break;
} }
@@ -591,6 +591,6 @@ bool csCommandState::Undo()
} }
} }
return TRUE; return true;
} }

26
contrib/samples/ogl/studio/mainfrm.cpp
View File

@@ -52,8 +52,7 @@ BEGIN_EVENT_TABLE(csFrame, wxDocMDIParentFrame)
END_EVENT_TABLE() END_EVENT_TABLE()
// Define my frame constructor // Define my frame constructor
csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
long style):
wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame")) wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))
{ {
CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL); CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
@@ -73,7 +72,10 @@ csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wx
void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event)) void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{ {
wxGetApp().GetHelpController().DisplayContents(); wxHelpControllerBase* help;
help = wxGetApp().GetHelpController();
if (help)
help->DisplayContents();
} }
void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event)) void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
@@ -85,7 +87,7 @@ void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
Close(TRUE); Close(true);
} }
void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -155,24 +157,24 @@ void csFrame::OnIdle(wxIdleEvent& event)
wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow(); wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
if (!paletteWin || !diagramToolBarWin) if (!paletteWin || !diagramToolBarWin)
return; return;
bool doLayout = FALSE; bool doLayout = false;
if (GetActiveChild()) if (GetActiveChild())
{ {
if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown()) if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
{ {
paletteWin->Show(TRUE); paletteWin->Show(true);
diagramToolBarWin->Show(TRUE); diagramToolBarWin->Show(true);
doLayout = TRUE; doLayout = true;
} }
} }
else else
{ {
if (paletteWin->IsShown() || diagramToolBarWin->IsShown()) if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
{ {
paletteWin->Show(FALSE); paletteWin->Show(false);
diagramToolBarWin->Show(FALSE); diagramToolBarWin->Show(false);
doLayout = TRUE; doLayout = true;
} }
} }
if (doLayout) if (doLayout)
@@ -206,7 +208,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
// General handler for disabling items // General handler for disabling items
void csFrame::OnUpdateDisable(wxUpdateUIEvent& event) void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
{ {
event.Enable(FALSE); event.Enable(false);
} }
void csFrame::OnSaveUpdate(wxUpdateUIEvent& event) void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)

9
contrib/samples/ogl/studio/project.cpp
View File

@@ -31,8 +31,7 @@ BEGIN_EVENT_TABLE(csProjectTreeCtrl, wxTreeCtrl)
END_EVENT_TABLE() END_EVENT_TABLE()
// Define my frame constructor // Define my frame constructor
csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
long style):
wxTreeCtrl(parent, id, pos, size, style), wxTreeCtrl(parent, id, pos, size, style),
m_imageList(16, 16) m_imageList(16, 16)
@@ -58,7 +57,7 @@ bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
win->SetOrientation(wxLAYOUT_VERTICAL); win->SetOrientation(wxLAYOUT_VERTICAL);
win->SetAlignment(wxLAYOUT_LEFT); win->SetAlignment(wxLAYOUT_LEFT);
win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
win->SetSashVisible(wxSASH_RIGHT, TRUE); win->SetSashVisible(wxSASH_RIGHT, true);
win->SetExtraBorderSize(5); win->SetExtraBorderSize(5);
m_projectSashWindow = win; m_projectSashWindow = win;
@@ -67,10 +66,10 @@ bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxDOUBLE_BORDER); wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxDOUBLE_BORDER);
// For now, hide the window // For now, hide the window
m_projectSashWindow->Show(FALSE); m_projectSashWindow->Show(false);
#endif #endif
return TRUE; return true;
} }
// Fill out the project tree control // Fill out the project tree control

58
contrib/samples/ogl/studio/shapes.cpp
View File

@@ -130,7 +130,7 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
// If the shape was selected, deselect it and vice versa. // If the shape was selected, deselect it and vice versa.
bool selected = GetShape()->Selected(); bool selected = GetShape()->Selected();
view->SelectAll(FALSE); view->SelectAll(false);
selected = !selected; selected = !selected;
@@ -143,13 +143,13 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
{ {
if (GetShape()->Selected()) if (GetShape()->Selected())
{ {
GetShape()->Select(FALSE, &dc); GetShape()->Select(false, &dc);
view->SelectShape(GetShape(), FALSE); view->SelectShape(GetShape(), false);
} }
else else
{ {
GetShape()->Select(TRUE, &dc); GetShape()->Select(true, &dc);
view->SelectShape(GetShape(), TRUE); view->SelectShape(GetShape(), true);
} }
GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
} }
@@ -477,7 +477,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
wxClientDC dc(canvas); wxClientDC dc(canvas);
canvas->PrepareDC(dc); canvas->PrepareDC(dc);
shape->SetDisableLabel(FALSE); shape->SetDisableLabel(false);
if (lpt->m_type == CONTROL_POINT_LINE) if (lpt->m_type == CONTROL_POINT_LINE)
{ {
@@ -529,7 +529,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
shape->Recompute(); shape->Recompute();
shape->ResetControlPoints(); shape->ResetControlPoints();
if (!pt->m_eraseObject) if (!pt->m_eraseObject)
shape->Show(FALSE); shape->Show(false);
*/ */
wxShape* newShape = shape->CreateNewCopy(); wxShape* newShape = shape->CreateNewCopy();
@@ -612,7 +612,7 @@ bool csEvtHandler::EditProperties()
// For now, no line property editing // For now, no line property editing
if (shape->IsKindOf(CLASSINFO(wxLineShape))) if (shape->IsKindOf(CLASSINFO(wxLineShape)))
return FALSE; return false;
csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView(); csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
@@ -677,7 +677,7 @@ bool csEvtHandler::EditProperties()
else else
{ {
wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION); wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);
return FALSE; return false;
} }
csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName); csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);
@@ -685,7 +685,7 @@ bool csEvtHandler::EditProperties()
if (dialog->ShowModal() == wxID_CANCEL) if (dialog->ShowModal() == wxID_CANCEL)
{ {
dialog->Destroy(); dialog->Destroy();
return FALSE; return false;
} }
wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel(); wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();
@@ -699,7 +699,7 @@ bool csEvtHandler::EditProperties()
view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(), view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape))); new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));
return TRUE; return true;
} }
/* /*
@@ -711,7 +711,7 @@ bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
wxDiagram::OnShapeSave(db, shape, expr); wxDiagram::OnShapeSave(db, shape, expr);
csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler(); csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
expr.AddAttributeValueString(_T("label"), handler->m_label); expr.AddAttributeValueString(_T("label"), handler->m_label);
return TRUE; return true;
} }
bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr) bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
@@ -722,7 +722,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
csEvtHandler *handler = new csEvtHandler(&shape, &shape, label); csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
shape.SetEventHandler(handler); shape.SetEventHandler(handler);
return TRUE; return true;
} }
IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape) IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
@@ -741,7 +741,7 @@ csThinRectangleShape::csThinRectangleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape) IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)
@@ -760,7 +760,7 @@ csWideRectangleShape::csWideRectangleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape) IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)
@@ -814,7 +814,7 @@ csTriangleShape::csTriangleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape) IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)
@@ -911,7 +911,7 @@ csSemiCircleShape::csSemiCircleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape) IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)
@@ -926,7 +926,7 @@ csCircleShape::csCircleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape) IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)
@@ -941,7 +941,7 @@ csCircleShadowShape::csCircleShadowShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
SetShadowMode(SHADOW_RIGHT); SetShadowMode(SHADOW_RIGHT);
} }
@@ -971,7 +971,7 @@ csOctagonShape::csOctagonShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING); SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
// This is a transparent shape for drawing around other shapes. // This is a transparent shape for drawing around other shapes.
@@ -983,7 +983,7 @@ csGroupShape::csGroupShape()
SetBrush(wxTRANSPARENT_BRUSH); SetBrush(wxTRANSPARENT_BRUSH);
SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH); SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);
SetCentreResize(FALSE); SetCentreResize(false);
} }
void csGroupShape::OnDraw(wxDC& dc) void csGroupShape::OnDraw(wxDC& dc)
@@ -1013,20 +1013,20 @@ bool csGroupShape::HitTest(double x, double y, int* attachment, double* distance
if (x >= x1 && x <= x2) if (x >= x1 && x <= x2)
{ {
if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance)) if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))
return TRUE; return true;
if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance)) if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))
return TRUE; return true;
} }
// Left/right edges // Left/right edges
if (y >= y1 && y <= y2) if (y >= y1 && y <= y2)
{ {
if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance)) if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))
return TRUE; return true;
if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance)) if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))
return TRUE; return true;
} }
return FALSE; return false;
} }
IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape) IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)
@@ -1040,7 +1040,7 @@ csTextBoxShape::csTextBoxShape()
SetAttachmentMode(ATTACHMENT_MODE_NONE); SetAttachmentMode(ATTACHMENT_MODE_NONE);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB); SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE); SetCentreResize(false);
} }
IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape) IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)
@@ -1066,7 +1066,7 @@ bool csLineShape::OnMoveMiddleControlPoint(wxDC& WXUNUSED(dc), wxLineControlPoin
view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(), view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this))); new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));
return TRUE; return true;
} }
wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h) wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
@@ -1085,7 +1085,7 @@ bool csLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, d
view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(), view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
new csCommandState(ID_CS_MOVE_LABEL, newShape, this))); new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));
return TRUE; return true;
} }
#endif #endif

4
contrib/samples/ogl/studio/shapes.h
View File

@@ -73,8 +73,8 @@ public:
// Overridables // Overridables
// Start/end copying // Start/end copying
virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; }; virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; }; virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
// Override this to e.g. have the shape added through a Do/Undo command system. // Override this to e.g. have the shape added through a Do/Undo command system.
// By default, we'll just add it directly to the destination diagram, and // By default, we'll just add it directly to the destination diagram, and

81
contrib/samples/ogl/studio/studio.cpp
View File

@@ -95,10 +95,16 @@ bool csApp::OnInit(void)
if (!wxResourceParseFile(_T("studio_resources.wxr"))) if (!wxResourceParseFile(_T("studio_resources.wxr")))
{ {
wxMessageBox(_T("Could not find or parse resource file: studio_resources.wxr"), _T("Studio")); wxMessageBox(_T("Could not find or parse resource file: studio_resources.wxr"), _T("Studio"));
return FALSE; return false;
} }
m_helpController.Initialize(_T("studio.hlp")); #if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
m_helpController = new wxWinHelpController;
#else
m_helpController = new wxHtmlHelpController;
#endif
m_helpController->Initialize(_T("studio.hlp"));
ReadOptions(); ReadOptions();
@@ -121,7 +127,7 @@ bool csApp::OnInit(void)
#define wxDEFAULT_FRAME_STYLE_NO_CLIP \ #define wxDEFAULT_FRAME_STYLE_NO_CLIP \
(wxDEFAULT_FRAME_STYLE & ~wxCLIP_CHILDREN) (wxDEFAULT_FRAME_STYLE & ~wxCLIP_CHILDREN)
csFrame* frame = new csFrame(m_docManager, NULL, -1, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize, csFrame* frame = new csFrame(m_docManager, NULL, wxID_ANY, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize,
wxDEFAULT_FRAME_STYLE_NO_CLIP | wxHSCROLL | wxVSCROLL); wxDEFAULT_FRAME_STYLE_NO_CLIP | wxHSCROLL | wxVSCROLL);
// Give it an icon // Give it an icon
@@ -184,11 +190,11 @@ bool csApp::OnInit(void)
m_shapeEditMenu->AppendSeparator(); m_shapeEditMenu->AppendSeparator();
m_shapeEditMenu->Append(ID_CS_CUT, _T("Cut")); m_shapeEditMenu->Append(ID_CS_CUT, _T("Cut"));
frame->Show(TRUE); frame->Show(true);
SetTopWindow(frame); SetTopWindow(frame);
return TRUE; return true;
} }
int csApp::OnExit(void) int csApp::OnExit(void)
@@ -204,6 +210,9 @@ int csApp::OnExit(void)
delete m_shapeEditMenu; delete m_shapeEditMenu;
m_shapeEditMenu = NULL; m_shapeEditMenu = NULL;
delete m_helpController;
m_helpController = NULL;
wxOGLCleanUp(); wxOGLCleanUp();
return 0; return 0;
@@ -217,7 +226,7 @@ int csApp::OnExit(void)
wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenuRet) wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenuRet)
{ {
//// Make a child frame //// Make a child frame
csMDIChildFrame *subframe = new csMDIChildFrame(doc, view, ((wxDocMDIParentFrame*)GetTopWindow()), -1, _T("Child Frame"), csMDIChildFrame *subframe = new csMDIChildFrame(doc, view, ((wxDocMDIParentFrame*)GetTopWindow()), wxID_ANY, _T("Child Frame"),
wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -336,28 +345,28 @@ void csApp::InitToolBar(wxToolBar* toolBar)
#error "Not implemented for this platform." #error "Not implemented for this platform."
#endif #endif
toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, FALSE, -1, -1, NULL, _T("New file")); toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("New file"));
toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, FALSE, -1, -1, NULL, _T("Open file")); toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Open file"));
toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, FALSE, -1, -1, NULL, _T("Save file")); toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Save file"));
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, FALSE, -1, -1, NULL, _T("Print")); toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Print"));
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, FALSE, -1, -1, NULL, _T("Copy")); toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Copy"));
toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, FALSE, -1, -1, NULL, _T("Cut")); toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Cut"));
toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, FALSE, -1, -1, NULL, _T("Paste")); toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Paste"));
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, FALSE, -1, -1, NULL, _T("Undo")); toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Undo"));
toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, FALSE, -1, -1, NULL, _T("Redo")); toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Redo"));
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, FALSE, -1, -1, NULL, _T("Help")); toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Help"));
toolBar->Realize(); toolBar->Realize();
toolBar->EnableTool(wxID_COPY, FALSE); toolBar->EnableTool(wxID_COPY, false);
toolBar->EnableTool(wxID_PASTE, FALSE); toolBar->EnableTool(wxID_PASTE, false);
toolBar->EnableTool(wxID_PRINT, FALSE); toolBar->EnableTool(wxID_PRINT, false);
toolBar->EnableTool(wxID_UNDO, FALSE); toolBar->EnableTool(wxID_UNDO, false);
toolBar->EnableTool(wxID_REDO, FALSE); toolBar->EnableTool(wxID_REDO, false);
int i; int i;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
@@ -375,10 +384,10 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
m_diagramToolBarSashWindow = win; m_diagramToolBarSashWindow = win;
m_diagramToolBarSashWindow->Show(FALSE); m_diagramToolBarSashWindow->Show(false);
// Create the actual toolbar // Create the actual toolbar
m_diagramToolBar = new wxToolBar(win, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT); m_diagramToolBar = new wxToolBar(win, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT);
wxBitmap* bitmaps[11]; wxBitmap* bitmaps[11];
@@ -410,18 +419,18 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
#error "Not implemented for this platform." #error "Not implemented for this platform."
#endif #endif
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align left")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align left"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align right")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align right"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align top")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align top"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align bottom")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align bottom"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align horizontally")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align horizontally"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align vertically")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align vertically"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, FALSE, -1, -1, NULL, _T("Copy size")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Copy size"));
m_diagramToolBar->AddSeparator(); m_diagramToolBar->AddSeparator();
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, TRUE, -1, -1, NULL, _T("Toggle arrow")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, true, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Toggle arrow"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, FALSE, -1, -1, NULL, _T("New line point")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("New line point"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, FALSE, -1, -1, NULL, _T("Cut line point")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Cut line point"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, FALSE, -1, -1, NULL, _T("Straighten lines")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Straighten lines"));
m_diagramToolBar->Realize(); m_diagramToolBar->Realize();
@@ -500,7 +509,7 @@ bool csApp::ReadOptions()
config.Read(_T("gridStyle"), & m_gridStyle); config.Read(_T("gridStyle"), & m_gridStyle);
config.Read(_T("gridSpacing"), & m_gridSpacing); config.Read(_T("gridSpacing"), & m_gridSpacing);
return TRUE; return true;
} }
bool csApp::WriteOptions() bool csApp::WriteOptions()
@@ -516,6 +525,6 @@ bool csApp::WriteOptions()
m_docManager->FileHistorySave(config); m_docManager->FileHistorySave(config);
return TRUE; return true;
} }

11
contrib/samples/ogl/studio/studio.h
View File

@@ -14,6 +14,13 @@
#include <wx/docmdi.h> #include <wx/docmdi.h>
#include <wx/help.h> #include <wx/help.h>
#include <wx/cshelp.h>
#include <wx/helphtml.h>
#ifdef __WXMSW__
#include <wx/msw/helpchm.h>
#else
#include <wx/html/helpctrl.h>
#endif
#include <wx/ogl/ogl.h> #include <wx/ogl/ogl.h>
#include <wx/ogl/canvas.h> #include <wx/ogl/canvas.h>
@@ -81,7 +88,7 @@ public:
wxMenu* GetShapeEditMenu() const { return m_shapeEditMenu; } wxMenu* GetShapeEditMenu() const { return m_shapeEditMenu; }
wxDiagramClipboard& GetDiagramClipboard() const { return (wxDiagramClipboard&) m_diagramClipboard; } wxDiagramClipboard& GetDiagramClipboard() const { return (wxDiagramClipboard&) m_diagramClipboard; }
wxDocManager* GetDocManager() const { return m_docManager; } wxDocManager* GetDocManager() const { return m_docManager; }
wxHelpController& GetHelpController() const { return (wxHelpController&) m_helpController; } wxHelpControllerBase* GetHelpController() const { return m_helpController; }
int GetGridStyle() const { return m_gridStyle; } int GetGridStyle() const { return m_gridStyle; }
void SetGridStyle(int style) { m_gridStyle = style; } void SetGridStyle(int style) { m_gridStyle = style; }
@@ -112,7 +119,7 @@ protected:
csDiagramClipboard m_diagramClipboard; csDiagramClipboard m_diagramClipboard;
// Help instance // Help instance
wxHelpController m_helpController; wxHelpControllerBase* m_helpController;
}; };
DECLARE_APP(csApp) DECLARE_APP(csApp)

2
contrib/samples/ogl/studio/symbols.cpp
View File

@@ -212,7 +212,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID)); memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
memDC.Clear(); memDC.Clear();
symbol->GetShape()->Show(TRUE); symbol->GetShape()->Show(true);
symbol->GetShape()->Move(memDC, centreX, centreY); symbol->GetShape()->Move(memDC, centreX, centreY);
memDC.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap);

40
contrib/samples/ogl/studio/view.cpp
View File

@@ -95,7 +95,7 @@ bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
canvas->SetView(this); canvas->SetView(this);
SetFrame(frame); SetFrame(frame);
Activate(TRUE); Activate(true);
// Initialize the edit menu Undo and Redo items // Initialize the edit menu Undo and Redo items
doc->GetCommandProcessor()->SetEditMenu(editMenu); doc->GetCommandProcessor()->SetEditMenu(editMenu);
@@ -112,12 +112,12 @@ bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
{ {
case csGRID_STYLE_NONE: case csGRID_STYLE_NONE:
{ {
diagramDoc->GetDiagram()->SetSnapToGrid(FALSE); diagramDoc->GetDiagram()->SetSnapToGrid(false);
break; break;
} }
case csGRID_STYLE_INVISIBLE: case csGRID_STYLE_INVISIBLE:
{ {
diagramDoc->GetDiagram()->SetSnapToGrid(TRUE); diagramDoc->GetDiagram()->SetSnapToGrid(true);
break; break;
} }
case csGRID_STYLE_DOTTED: case csGRID_STYLE_DOTTED:
@@ -128,7 +128,7 @@ bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
} }
return TRUE; return true;
} }
csDiagramView::~csDiagramView(void) csDiagramView::~csDiagramView(void)
@@ -155,7 +155,7 @@ void csDiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
bool csDiagramView::OnClose(bool deleteWindow) bool csDiagramView::OnClose(bool deleteWindow)
{ {
if (!GetDocument()->Close()) if (!GetDocument()->Close())
return FALSE; return false;
csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument(); csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument();
diagramDoc->GetDiagram()->SetCanvas(NULL); diagramDoc->GetDiagram()->SetCanvas(NULL);
@@ -170,15 +170,15 @@ bool csDiagramView::OnClose(bool deleteWindow)
// Remove file menu from those managed by the command history // Remove file menu from those managed by the command history
wxGetApp().GetDocManager()->FileHistoryRemoveMenu(fileMenu); wxGetApp().GetDocManager()->FileHistoryRemoveMenu(fileMenu);
Activate(FALSE); Activate(false);
frame->Show(FALSE); frame->Show(false);
if (deleteWindow) if (deleteWindow)
{ {
frame->Destroy(); frame->Destroy();
} }
return TRUE; return true;
} }
// Adds or removes shape from m_selections // Adds or removes shape from m_selections
@@ -192,7 +192,7 @@ void csDiagramView::SelectShape(wxShape* shape, bool select)
void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event)) void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
{ {
SelectAll(TRUE); SelectAll(true);
} }
wxShape *csDiagramView::FindFirstSelectedShape(void) wxShape *csDiagramView::FindFirstSelectedShape(void)
@@ -389,7 +389,7 @@ void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
if (selections.GetCount() > 0) if (selections.GetCount() > 0)
{ {
wxColourData data; wxColourData data;
data.SetChooseFull(TRUE); data.SetChooseFull(true);
if (selections.GetCount() == 1) if (selections.GetCount() == 1)
{ {
wxShape* firstShape = (wxShape*) selections.GetFirst()->GetData(); wxShape* firstShape = (wxShape*) selections.GetFirst()->GetData();
@@ -404,7 +404,7 @@ void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
wxColour col = retData.GetColour(); wxColour col = retData.GetColour();
theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID); theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
} }
dialog->Close(TRUE); dialog->Close(true);
if (!theBrush) if (!theBrush)
return; return;
@@ -535,8 +535,8 @@ void csDiagramView::SelectAll(bool select)
while (node) while (node)
{ {
wxShape *theShape = (wxShape*) node->GetData(); wxShape *theShape = (wxShape*) node->GetData();
theShape->Select(FALSE, &dc); theShape->Select(false, &dc);
SelectShape(theShape, FALSE); SelectShape(theShape, false);
node = node->GetNext(); node = node->GetNext();
} }
@@ -552,8 +552,8 @@ void csDiagramView::SelectAll(bool select)
!eachShape->IsKindOf(CLASSINFO(wxControlPoint)) && !eachShape->IsKindOf(CLASSINFO(wxControlPoint)) &&
!eachShape->IsKindOf(CLASSINFO(wxLabelShape))) !eachShape->IsKindOf(CLASSINFO(wxLabelShape)))
{ {
eachShape->Select(TRUE, &dc); eachShape->Select(true, &dc);
SelectShape(eachShape, TRUE); SelectShape(eachShape, true);
} }
node = node->GetNext(); node = node->GetNext();
} }
@@ -633,13 +633,13 @@ void csDiagramView::ReflectPointSize(int pointSize)
// Make the arrow toggle button reflect the state of the line // Make the arrow toggle button reflect the state of the line
void csDiagramView::ReflectArrowState(wxLineShape* lineShape) void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
{ {
bool haveArrow = FALSE; bool haveArrow = false;
wxNode *node = lineShape->GetArrows().GetFirst(); wxNode *node = lineShape->GetArrows().GetFirst();
while (node) while (node)
{ {
wxArrowHead *arrow = (wxArrowHead *)node->GetData(); wxArrowHead *arrow = (wxArrowHead *)node->GetData();
if (ARROW_POSITION_MIDDLE == arrow->GetArrowEnd()) if (ARROW_POSITION_MIDDLE == arrow->GetArrowEnd())
haveArrow = TRUE; haveArrow = true;
node = node->GetNext(); node = node->GetNext();
} }
@@ -868,7 +868,7 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
if (palette->GetSelection() == PALETTE_ARROW) if (palette->GetSelection() == PALETTE_ARROW)
{ {
GetView()->SelectAll(FALSE); GetView()->SelectAll(false);
wxClientDC dc(this); wxClientDC dc(this);
PrepareDC(dc); PrepareDC(dc);
@@ -1010,8 +1010,8 @@ void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
if (image_x >= min_x && image_x <= max_x && if (image_x >= min_x && image_x <= max_x &&
image_y >= min_y && image_y <= max_y) image_y >= min_y && image_y <= max_y)
{ {
shape->Select(TRUE, &dc); shape->Select(true, &dc);
GetView()->SelectShape(shape, TRUE); GetView()->SelectShape(shape, true);
} }
} }
node = node->GetNext(); node = node->GetNext();

6
contrib/samples/ogl/studio/view.h
View File

@@ -25,7 +25,7 @@ class csCanvas: public wxShapeCanvas
DECLARE_CLASS(csCanvas) DECLARE_CLASS(csCanvas)
public: public:
csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = -1, csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxRETAINED); long style = wxRETAINED);
~csCanvas(void); ~csCanvas(void);
@@ -65,7 +65,7 @@ class csDiagramView: public wxView
bool OnCreate(wxDocument *doc, long flags); bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc); void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL); void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose(bool deleteWindow = TRUE); bool OnClose(bool deleteWindow = true);
void OnSelectAll(wxCommandEvent& event); void OnSelectAll(wxCommandEvent& event);
wxShape *FindFirstSelectedShape(void); wxShape *FindFirstSelectedShape(void);
@@ -95,7 +95,7 @@ class csDiagramView: public wxView
void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op); void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
// Select or deselect all // Select or deselect all
void SelectAll(bool select = TRUE); void SelectAll(bool select = true);
// Event handlers // Event handlers
void OnCut(wxCommandEvent& event); void OnCut(wxCommandEvent& event);

132
contrib/src/ogl/basic.cpp
View File

@@ -137,7 +137,7 @@ bool wxShapeEvtHandler::OnMovePre(wxDC& dc, double x, double y, double old_x, do
if (m_previousHandler) if (m_previousHandler)
return m_previousHandler->OnMovePre(dc, x, y, old_x, old_y, display); return m_previousHandler->OnMovePre(dc, x, y, old_x, old_y, display);
else else
return TRUE; return true;
} }
void wxShapeEvtHandler::OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display) void wxShapeEvtHandler::OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
@@ -270,7 +270,7 @@ wxShape::wxShape(wxShapeCanvas *can)
m_eventHandler = this; m_eventHandler = this;
SetShape(this); SetShape(this);
m_id = 0; m_id = 0;
m_formatted = FALSE; m_formatted = false;
m_canvas = can; m_canvas = can;
m_xpos = 0.0; m_ypos = 0.0; m_xpos = 0.0; m_ypos = 0.0;
m_pen = g_oglBlackPen; m_pen = g_oglBlackPen;
@@ -278,16 +278,16 @@ wxShape::wxShape(wxShapeCanvas *can)
m_font = g_oglNormalFont; m_font = g_oglNormalFont;
m_textColour = wxT("BLACK"); m_textColour = wxT("BLACK");
m_textColourName = wxT("BLACK"); m_textColourName = wxT("BLACK");
m_visible = FALSE; m_visible = false;
m_selected = FALSE; m_selected = false;
m_attachmentMode = ATTACHMENT_MODE_NONE; m_attachmentMode = ATTACHMENT_MODE_NONE;
m_spaceAttachments = TRUE; m_spaceAttachments = true;
m_disableLabel = FALSE; m_disableLabel = false;
m_fixedWidth = FALSE; m_fixedWidth = false;
m_fixedHeight = FALSE; m_fixedHeight = false;
m_drawHandles = TRUE; m_drawHandles = true;
m_sensitivity = OP_ALL; m_sensitivity = OP_ALL;
m_draggable = TRUE; m_draggable = true;
m_parent = NULL; m_parent = NULL;
m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT; m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
m_shadowMode = SHADOW_NONE; m_shadowMode = SHADOW_NONE;
@@ -297,9 +297,9 @@ wxShape::wxShape(wxShapeCanvas *can)
m_textMarginX = 5; m_textMarginX = 5;
m_textMarginY = 5; m_textMarginY = 5;
m_regionName = wxT("0"); m_regionName = wxT("0");
m_centreResize = TRUE; m_centreResize = true;
m_maintainAspectRatio = FALSE; m_maintainAspectRatio = false;
m_highlighted = FALSE; m_highlighted = false;
m_rotation = 0.0; m_rotation = 0.0;
m_branchNeckLength = 10; m_branchNeckLength = 10;
m_branchStemLength = 10; m_branchStemLength = 10;
@@ -349,9 +349,9 @@ void wxShape::SetHighlight(bool hi, bool recurse)
void wxShape::SetSensitivityFilter(int sens, bool recursive) void wxShape::SetSensitivityFilter(int sens, bool recursive)
{ {
if (sens & OP_DRAG_LEFT) if (sens & OP_DRAG_LEFT)
m_draggable = TRUE; m_draggable = true;
else else
m_draggable = FALSE; m_draggable = false;
m_sensitivity = sens; m_sensitivity = sens;
if (recursive) if (recursive)
@@ -360,7 +360,7 @@ void wxShape::SetSensitivityFilter(int sens, bool recursive)
while (node) while (node)
{ {
wxShape *obj = (wxShape *)node->GetData(); wxShape *obj = (wxShape *)node->GetData();
obj->SetSensitivityFilter(sens, TRUE); obj->SetSensitivityFilter(sens, true);
node = node->GetNext(); node = node->GetNext();
} }
} }
@@ -381,7 +381,7 @@ void wxShape::SetDraggable(bool drag, bool recursive)
while (node) while (node)
{ {
wxShape *obj = (wxShape *)node->GetData(); wxShape *obj = (wxShape *)node->GetData();
obj->SetDraggable(drag, TRUE); obj->SetDraggable(drag, true);
node = node->GetNext(); node = node->GetNext();
} }
} }
@@ -463,7 +463,7 @@ void wxShape::InsertInCanvas(wxShapeCanvas *theCanvas)
void wxShape::RemoveFromCanvas(wxShapeCanvas *theCanvas) void wxShape::RemoveFromCanvas(wxShapeCanvas *theCanvas)
{ {
if (Selected()) if (Selected())
Select(FALSE); Select(false);
theCanvas->RemoveShape(this); theCanvas->RemoveShape(this);
wxNode *node = m_children.GetFirst(); wxNode *node = m_children.GetFirst();
while (node) while (node)
@@ -491,9 +491,9 @@ void wxShape::ClearText(int regionId)
{ {
if (regionId == 0) if (regionId == 0)
{ {
m_text.DeleteContents(TRUE); m_text.DeleteContents(true);
m_text.Clear(); m_text.Clear();
m_text.DeleteContents(FALSE); m_text.DeleteContents(false);
} }
wxNode *node = m_regions.Item(regionId); wxNode *node = m_regions.Item(regionId);
if (!node) if (!node)
@@ -533,7 +533,7 @@ void wxShape::SetDefaultRegionSize()
bool wxShape::HitTest(double x, double y, int *attachment, double *distance) bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
{ {
// if (!sensitive) // if (!sensitive)
// return FALSE; // return false;
double width = 0.0, height = 0.0; double width = 0.0, height = 0.0;
GetBoundingBoxMin(&width, &height); GetBoundingBoxMin(&width, &height);
@@ -577,15 +577,15 @@ bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
} }
*attachment = nearest_attachment; *attachment = nearest_attachment;
*distance = nearest; *distance = nearest;
return TRUE; return true;
} }
else return FALSE; else return false;
} }
// Format a text string according to the region size, adding // Format a text string according to the region size, adding
// strings with positions to region text list // strings with positions to region text list
static bool GraphicsInSizeToContents = FALSE; // Infinite recursion elimination static bool GraphicsInSizeToContents = false; // Infinite recursion elimination
void wxShape::FormatText(wxDC& dc, const wxString& s, int i) void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
{ {
double w, h; double w, h;
@@ -632,7 +632,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
if (topAncestor != this) if (topAncestor != this)
{ {
// Make sure we don't recurse infinitely // Make sure we don't recurse infinitely
GraphicsInSizeToContents = TRUE; GraphicsInSizeToContents = true;
wxCompositeShape *composite = (wxCompositeShape *)topAncestor; wxCompositeShape *composite = (wxCompositeShape *)topAncestor;
composite->Erase(dc); composite->Erase(dc);
@@ -648,7 +648,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
// Where infinite recursion might happen if we didn't stop it // Where infinite recursion might happen if we didn't stop it
composite->Draw(dc); composite->Draw(dc);
GraphicsInSizeToContents = FALSE; GraphicsInSizeToContents = false;
} }
else else
{ {
@@ -662,7 +662,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
} }
} }
oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW-2*m_textMarginX, actualH-2*m_textMarginY, region->GetFormatMode()); oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW-2*m_textMarginX, actualH-2*m_textMarginY, region->GetFormatMode());
m_formatted = TRUE; m_formatted = true;
} }
void wxShape::Recentre(wxDC& dc) void wxShape::Recentre(wxDC& dc)
@@ -686,7 +686,7 @@ bool wxShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
double WXUNUSED(x2), double WXUNUSED(y2), double WXUNUSED(x2), double WXUNUSED(y2),
double *WXUNUSED(x3), double *WXUNUSED(y3)) double *WXUNUSED(x3), double *WXUNUSED(y3))
{ {
return FALSE; return false;
} }
void wxShape::SetPen(wxPen *the_pen) void wxShape::SetPen(wxPen *the_pen)
@@ -924,7 +924,7 @@ void wxShape::OnDrawContents(wxDC& dc)
if (!m_formatted) if (!m_formatted)
{ {
oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode()); oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());
m_formatted = TRUE; m_formatted = true;
} }
if (!GetDisableLabel()) if (!GetDisableLabel())
{ {
@@ -943,7 +943,7 @@ void wxShape::OnSize(double WXUNUSED(x), double WXUNUSED(y))
bool wxShape::OnMovePre(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display)) bool wxShape::OnMovePre(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
{ {
return TRUE; return true;
} }
void wxShape::OnMovePost(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display)) void wxShape::OnMovePost(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
@@ -1043,7 +1043,7 @@ void wxShape::DrawLinks(wxDC& dc, int attachment, bool recurse)
} }
} }
// Returns TRUE if pt1 <= pt2 in the sense that one point comes before another on an // Returns true if pt1 <= pt2 in the sense that one point comes before another on an
// edge of the shape. // edge of the shape.
// attachmentPoint is the attachment point (= side) in question. // attachmentPoint is the attachment point (= side) in question.
@@ -1065,14 +1065,14 @@ bool wxShape::AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, co
} }
} }
return FALSE; return false;
} }
bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move, bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
double x, double y) double x, double y)
{ {
if (GetAttachmentMode() == ATTACHMENT_MODE_NONE) if (GetAttachmentMode() == ATTACHMENT_MODE_NONE)
return FALSE; return false;
int newAttachment, oldAttachment; int newAttachment, oldAttachment;
double distance; double distance;
@@ -1081,7 +1081,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
// the user has moved the point to // the user has moved the point to
bool hit = HitTest(x, y, &newAttachment, &distance); bool hit = HitTest(x, y, &newAttachment, &distance);
if (!hit) if (!hit)
return FALSE; return false;
EraseLinks(dc); EraseLinks(dc);
@@ -1109,7 +1109,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
double old_y = (double) -99999.9; double old_y = (double) -99999.9;
node = newOrdering.GetFirst(); node = newOrdering.GetFirst();
bool found = FALSE; bool found = false;
while (!found && node) while (!found && node)
{ {
@@ -1136,7 +1136,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
if (AttachmentSortTest(newAttachment, newPoint, thisPoint) && AttachmentSortTest(newAttachment, lastPoint, newPoint)) if (AttachmentSortTest(newAttachment, newPoint, thisPoint) && AttachmentSortTest(newAttachment, lastPoint, newPoint))
{ {
found = TRUE; found = true;
newOrdering.Insert(node, to_move); newOrdering.Insert(node, to_move);
} }
@@ -1151,7 +1151,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering); GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);
return TRUE; return true;
} }
void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering) void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
@@ -1547,7 +1547,7 @@ void wxShape::Erase(wxDC& dc)
{ {
GetEventHandler()->OnErase(dc); GetEventHandler()->OnErase(dc);
GetEventHandler()->OnEraseControlPoints(dc); GetEventHandler()->OnEraseControlPoints(dc);
GetEventHandler()->OnDrawBranches(dc, TRUE); GetEventHandler()->OnDrawBranches(dc, true);
} }
void wxShape::EraseContents(wxDC& dc) void wxShape::EraseContents(wxDC& dc)
@@ -1566,7 +1566,7 @@ void wxShape::AddText(const wxString& string)
new wxShapeTextLine(0.0, 0.0, string); new wxShapeTextLine(0.0, 0.0, string);
region->GetFormattedText().Append(new_line); region->GetFormattedText().Append(new_line);
m_formatted = FALSE; m_formatted = false;
} }
void wxShape::SetSize(double x, double y, bool WXUNUSED(recursive)) void wxShape::SetSize(double x, double y, bool WXUNUSED(recursive))
@@ -1759,10 +1759,10 @@ void wxShape::WriteAttributes(wxExpr *clause)
clause->AddAttributeValue(_T("fixed_height"), (long)m_fixedHeight); clause->AddAttributeValue(_T("fixed_height"), (long)m_fixedHeight);
if (m_shadowMode != SHADOW_NONE) if (m_shadowMode != SHADOW_NONE)
clause->AddAttributeValue(_T("shadow_mode"), (long)m_shadowMode); clause->AddAttributeValue(_T("shadow_mode"), (long)m_shadowMode);
if (m_centreResize != TRUE) if (m_centreResize != true)
clause->AddAttributeValue(_T("centre_resize"), (long)0); clause->AddAttributeValue(_T("centre_resize"), (long)0);
clause->AddAttributeValue(_T("maintain_aspect_ratio"), (long) m_maintainAspectRatio); clause->AddAttributeValue(_T("maintain_aspect_ratio"), (long) m_maintainAspectRatio);
if (m_highlighted != FALSE) if (m_highlighted != false)
clause->AddAttributeValue(_T("hilite"), (long)m_highlighted); clause->AddAttributeValue(_T("hilite"), (long)m_highlighted);
if (m_parent) // For composite objects if (m_parent) // For composite objects
@@ -1882,7 +1882,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
wxExpr *strings = clause->AttributeValue(_T("text")); wxExpr *strings = clause->AttributeValue(_T("text"));
if (strings && strings->Type() == wxExprList) if (strings && strings->Type() == wxExprList)
{ {
m_formatted = TRUE; // Assume text is formatted unless we prove otherwise m_formatted = true; // Assume text is formatted unless we prove otherwise
wxExpr *node = strings->value.first; wxExpr *node = strings->value.first;
while (node) while (node)
{ {
@@ -1896,7 +1896,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
if (string_expr->Type() == wxExprString) if (string_expr->Type() == wxExprString)
{ {
the_string = string_expr->StringValue(); the_string = string_expr->StringValue();
m_formatted = FALSE; m_formatted = false;
} }
else if (string_expr->Type() == wxExprList) else if (string_expr->Type() == wxExprList)
{ {
@@ -2068,7 +2068,7 @@ void wxShape::ReadRegions(wxExpr *clause)
wxSprintf(regionNameBuf, _T("region%d"), regionNo); wxSprintf(regionNameBuf, _T("region%d"), regionNo);
wxSprintf(textNameBuf, _T("text%d"), regionNo); wxSprintf(textNameBuf, _T("text%d"), regionNo);
m_formatted = TRUE; // Assume text is formatted unless we prove otherwise m_formatted = true; // Assume text is formatted unless we prove otherwise
while ((regionExpr = clause->AttributeValue(regionNameBuf)) != NULL) while ((regionExpr = clause->AttributeValue(regionNameBuf)) != NULL)
{ {
@@ -2189,7 +2189,7 @@ void wxShape::ReadRegions(wxExpr *clause)
if (string_expr->Type() == wxExprString) if (string_expr->Type() == wxExprString)
{ {
the_string = string_expr->StringValue(); the_string = string_expr->StringValue();
m_formatted = FALSE; m_formatted = false;
} }
else if (string_expr->Type() == wxExprList) else if (string_expr->Type() == wxExprList)
{ {
@@ -2620,9 +2620,9 @@ bool wxShape::Selected() const
bool wxShape::AncestorSelected() const bool wxShape::AncestorSelected() const
{ {
if (m_selected) return TRUE; if (m_selected) return true;
if (!GetParent()) if (!GetParent())
return FALSE; return false;
else else
return GetParent()->AncestorSelected(); return GetParent()->AncestorSelected();
} }
@@ -2661,10 +2661,10 @@ bool wxShape::AttachmentIsValid(int attachment) const
{ {
wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData(); wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
if (point->m_id == attachment) if (point->m_id == attachment)
return TRUE; return true;
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y, bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
@@ -2673,7 +2673,7 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
if (m_attachmentMode == ATTACHMENT_MODE_NONE) if (m_attachmentMode == ATTACHMENT_MODE_NONE)
{ {
*x = m_xpos; *y = m_ypos; *x = m_xpos; *y = m_ypos;
return TRUE; return true;
} }
else if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING) else if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
{ {
@@ -2681,7 +2681,7 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
GetBranchingAttachmentPoint(attachment, nth, pt, stemPt); GetBranchingAttachmentPoint(attachment, nth, pt, stemPt);
*x = pt.x; *x = pt.x;
*y = pt.y; *y = pt.y;
return TRUE; return true;
} }
else if (m_attachmentMode == ATTACHMENT_MODE_EDGE) else if (m_attachmentMode == ATTACHMENT_MODE_EDGE)
{ {
@@ -2695,12 +2695,12 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
{ {
*x = (double)(m_xpos + point->m_x); *x = (double)(m_xpos + point->m_x);
*y = (double)(m_ypos + point->m_y); *y = (double)(m_ypos + point->m_y);
return TRUE; return true;
} }
node = node->GetNext(); node = node->GetNext();
} }
*x = m_xpos; *y = m_ypos; *x = m_xpos; *y = m_ypos;
return FALSE; return false;
} }
else else
{ {
@@ -2753,13 +2753,13 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
} }
default: default:
{ {
return FALSE; return false;
} }
} }
return TRUE; return true;
} }
} }
return FALSE; return false;
} }
void wxShape::GetBoundingBoxMax(double *w, double *h) void wxShape::GetBoundingBoxMax(double *w, double *h)
@@ -2775,21 +2775,21 @@ void wxShape::GetBoundingBoxMax(double *w, double *h)
*h = hh; *h = hh;
} }
// Returns TRUE if image is a descendant of this composite // Returns true if image is a descendant of this composite
bool wxShape::HasDescendant(wxShape *image) bool wxShape::HasDescendant(wxShape *image)
{ {
if (image == this) if (image == this)
return TRUE; return true;
wxNode *node = m_children.GetFirst(); wxNode *node = m_children.GetFirst();
while (node) while (node)
{ {
wxShape *child = (wxShape *)node->GetData(); wxShape *child = (wxShape *)node->GetData();
bool ans = child->HasDescendant(image); bool ans = child->HasDescendant(image);
if (ans) if (ans)
return TRUE; return true;
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
// Clears points from a list of wxRealPoints, and clears list // Clears points from a list of wxRealPoints, and clears list
@@ -2814,7 +2814,7 @@ wxRealPoint wxShape::CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPo
bool isEnd = (line && line->IsEnd(this)); bool isEnd = (line && line->IsEnd(this));
// Are we horizontal or vertical? // Are we horizontal or vertical?
bool isHorizontal = (oglRoughlyEqual(pt1.y, pt2.y) == TRUE); bool isHorizontal = (oglRoughlyEqual(pt1.y, pt2.y) == true);
double x, y; double x, y;
@@ -2854,7 +2854,7 @@ wxRealPoint wxShape::CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPo
} }
else else
{ {
wxASSERT( oglRoughlyEqual(pt1.x, pt2.x) == TRUE ); wxASSERT( oglRoughlyEqual(pt1.x, pt2.x) == true );
wxRealPoint firstPoint, secondPoint; wxRealPoint firstPoint, secondPoint;
if (pt1.y > pt2.y) if (pt1.y > pt2.y)
@@ -2911,7 +2911,7 @@ int wxShape::GetLinePosition(wxLineShape* line)
// <- branching attachment point N-1 // <- branching attachment point N-1
// This function gets information about where branching connections go. // This function gets information about where branching connections go.
// Returns FALSE if there are no lines at this attachment. // Returns false if there are no lines at this attachment.
bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck, bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
wxRealPoint& shoulder1, wxRealPoint& shoulder2) wxRealPoint& shoulder1, wxRealPoint& shoulder2)
{ {
@@ -2921,7 +2921,7 @@ bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRe
int lineCount = GetAttachmentLineCount(attachment); int lineCount = GetAttachmentLineCount(attachment);
if (lineCount == 0) if (lineCount == 0)
return FALSE; return false;
int totalBranchLength = m_branchSpacing * (lineCount - 1); int totalBranchLength = m_branchSpacing * (lineCount - 1);
@@ -2984,7 +2984,7 @@ bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRe
break; break;
} }
} }
return TRUE; return true;
} }
// n is the number of the adjoining line, from 0 to N-1 where N is the number of lines // n is the number of the adjoining line, from 0 to N-1 where N is the number of lines
@@ -3044,7 +3044,7 @@ bool wxShape::GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& pt
} }
} }
return TRUE; return true;
} }
// Get the number of lines at this attachment position. // Get the number of lines at this attachment position.

54
contrib/src/ogl/basic2.cpp
View File

@@ -202,7 +202,7 @@ void wxPolygonShape::CalculatePolygonCentre()
bool PolylineHitTest(double n, double xvec[], double yvec[], bool PolylineHitTest(double n, double xvec[], double yvec[],
double x1, double y1, double x2, double y2) double x1, double y1, double x2, double y2)
{ {
bool isAHit = FALSE; bool isAHit = false;
int i; int i;
double lastx = xvec[0]; double lastx = xvec[0];
double lasty = yvec[0]; double lasty = yvec[0];
@@ -216,7 +216,7 @@ bool PolylineHitTest(double n, double xvec[], double yvec[],
oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[i], yvec[i], oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[i], yvec[i],
&line_ratio, &other_ratio); &line_ratio, &other_ratio);
if (line_ratio != 1.0) if (line_ratio != 1.0)
isAHit = TRUE; isAHit = true;
lastx = xvec[i]; lastx = xvec[i];
lasty = yvec[i]; lasty = yvec[i];
@@ -230,7 +230,7 @@ bool PolylineHitTest(double n, double xvec[], double yvec[],
oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[0], yvec[0], oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[0], yvec[0],
&line_ratio, &other_ratio); &line_ratio, &other_ratio);
if (line_ratio != 1.0) if (line_ratio != 1.0)
isAHit = TRUE; isAHit = true;
} }
return isAHit; return isAHit;
@@ -273,13 +273,13 @@ bool wxPolygonShape::HitTest(double x, double y, int *attachment, double *distan
// We assume it's inside the polygon UNLESS one or more // We assume it's inside the polygon UNLESS one or more
// lines don't hit the outline. // lines don't hit the outline.
bool isContained = TRUE; bool isContained = true;
int noPoints = 4; int noPoints = 4;
for (i = 0; i < noPoints; i++) for (i = 0; i < noPoints; i++)
{ {
if (!PolylineHitTest(np, xpoints, ypoints, x, y, endPointsX[i], endPointsY[i])) if (!PolylineHitTest(np, xpoints, ypoints, x, y, endPointsX[i], endPointsY[i]))
isContained = FALSE; isContained = false;
} }
/* /*
if (isContained) if (isContained)
@@ -291,7 +291,7 @@ bool wxPolygonShape::HitTest(double x, double y, int *attachment, double *distan
delete[] ypoints; delete[] ypoints;
if (!isContained) if (!isContained)
return FALSE; return false;
int nearest_attachment = 0; int nearest_attachment = 0;
@@ -315,7 +315,7 @@ bool wxPolygonShape::HitTest(double x, double y, int *attachment, double *distan
} }
*attachment = nearest_attachment; *attachment = nearest_attachment;
*distance = nearest; *distance = nearest;
return TRUE; return true;
} }
// Really need to be able to reset the shape! Otherwise, if the // Really need to be able to reset the shape! Otherwise, if the
@@ -447,13 +447,13 @@ bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
{ {
*x3 = point->x + m_xpos; *x3 = point->x + m_xpos;
*y3 = point->y + m_ypos; *y3 = point->y + m_ypos;
return TRUE; return true;
} }
else if ((y2 < y1) && (point->y < 0.0)) else if ((y2 < y1) && (point->y < 0.0))
{ {
*x3 = point->x + m_xpos; *x3 = point->x + m_xpos;
*y3 = point->y + m_ypos; *y3 = point->y + m_ypos;
return TRUE; return true;
} }
} }
node = node->GetNext(); node = node->GetNext();
@@ -480,7 +480,7 @@ bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
delete[] xpoints; delete[] xpoints;
delete[] ypoints; delete[] ypoints;
return TRUE; return true;
} }
void wxPolygonShape::OnDraw(wxDC& dc) void wxPolygonShape::OnDraw(wxDC& dc)
@@ -784,7 +784,7 @@ bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
wxRealPoint *point = (wxRealPoint *)m_points->Item(attachment)->GetData(); wxRealPoint *point = (wxRealPoint *)m_points->Item(attachment)->GetData();
*x = point->x + m_xpos; *x = point->x + m_xpos;
*y = point->y + m_ypos; *y = point->y + m_ypos;
return TRUE; return true;
} }
else else
{ return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); } { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
@@ -793,20 +793,20 @@ bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
bool wxPolygonShape::AttachmentIsValid(int attachment) const bool wxPolygonShape::AttachmentIsValid(int attachment) const
{ {
if (!m_points) if (!m_points)
return FALSE; return false;
if ((attachment >= 0) && (attachment < (int) m_points->GetCount())) if ((attachment >= 0) && (attachment < (int) m_points->GetCount()))
return TRUE; return true;
wxNode *node = m_attachmentPoints.GetFirst(); wxNode *node = m_attachmentPoints.GetFirst();
while (node) while (node)
{ {
wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData(); wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
if (point->m_id == attachment) if (point->m_id == attachment)
return TRUE; return true;
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
// Rotate about the given axis by the given amount in radians // Rotate about the given axis by the given amount in radians
@@ -928,7 +928,7 @@ bool wxRectangleShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1
GetBoundingBoxMax(&bound_x, &bound_y); GetBoundingBoxMax(&bound_x, &bound_y);
oglFindEndForBox(bound_x, bound_y, m_xpos, m_ypos, x2, y2, x3, y3); oglFindEndForBox(bound_x, bound_y, m_xpos, m_ypos, x2, y2, x3, y3);
return TRUE; return true;
} }
#if wxUSE_PROLOGIO #if wxUSE_PROLOGIO
@@ -1036,7 +1036,7 @@ bool wxEllipseShape::GetPerimeterPoint(double x1, double y1,
// oglFindEndForBox(bound_x, bound_y, m_xpos, m_ypos, x2, y2, x3, y3); // oglFindEndForBox(bound_x, bound_y, m_xpos, m_ypos, x2, y2, x3, y3);
oglDrawArcToEllipse(m_xpos, m_ypos, bound_x, bound_y, x2, y2, x1, y1, x3, y3); oglDrawArcToEllipse(m_xpos, m_ypos, bound_x, bound_y, x2, y2, x1, y1, x3, y3);
return TRUE; return true;
} }
void wxEllipseShape::OnDraw(wxDC& dc) void wxEllipseShape::OnDraw(wxDC& dc)
@@ -1177,10 +1177,10 @@ bool wxEllipseShape::GetAttachmentPosition(int attachment, double *x, double *y,
return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line);
} }
} }
return TRUE; return true;
} }
else else
{ *x = m_xpos; *y = m_ypos; return TRUE; } { *x = m_xpos; *y = m_ypos; return true; }
} }
@@ -1189,7 +1189,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCircleShape, wxEllipseShape)
wxCircleShape::wxCircleShape(double diameter):wxEllipseShape(diameter, diameter) wxCircleShape::wxCircleShape(double diameter):wxEllipseShape(diameter, diameter)
{ {
SetMaintainAspectRatio(TRUE); SetMaintainAspectRatio(true);
} }
void wxCircleShape::Copy(wxShape& copy) void wxCircleShape::Copy(wxShape& copy)
@@ -1206,7 +1206,7 @@ bool wxCircleShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
x2, y2, // Other end of line x2, y2, // Other end of line
x3, y3); x3, y3);
return TRUE; return true;
} }
// Control points // Control points
@@ -1232,8 +1232,8 @@ wxControlPoint::wxControlPoint(wxShapeCanvas *theCanvas, wxShape *object, double
SetPen(g_oglBlackForegroundPen); SetPen(g_oglBlackForegroundPen);
SetBrush(wxBLACK_BRUSH); SetBrush(wxBLACK_BRUSH);
m_oldCursor = NULL; m_oldCursor = NULL;
m_visible = TRUE; m_visible = true;
m_eraseObject = TRUE; m_eraseObject = true;
} }
wxControlPoint::~wxControlPoint() wxControlPoint::~wxControlPoint()
@@ -1282,7 +1282,7 @@ bool wxControlPoint::GetAttachmentPosition(int WXUNUSED(attachment), double *x,
int WXUNUSED(nth), int WXUNUSED(no_arcs), wxLineShape *WXUNUSED(line)) int WXUNUSED(nth), int WXUNUSED(no_arcs), wxLineShape *WXUNUSED(line))
{ {
*x = m_xpos; *y = m_ypos; *x = m_xpos; *y = m_ypos;
return TRUE; return true;
} }
// Control points ('handles') redirect control to the actual shape, to make it easier // Control points ('handles') redirect control to the actual shape, to make it easier
@@ -1540,7 +1540,7 @@ void wxShape::OnSizingEndDragLeft(wxControlPoint* pt, double WXUNUSED(x), double
this->Erase(dc); this->Erase(dc);
/* /*
if (!pt->m_eraseObject) if (!pt->m_eraseObject)
this->Show(FALSE); this->Show(false);
*/ */
this->SetSize(pt->sm_controlPointDragEndWidth, pt->sm_controlPointDragEndHeight); this->SetSize(pt->sm_controlPointDragEndWidth, pt->sm_controlPointDragEndHeight);
@@ -1559,12 +1559,12 @@ void wxShape::OnSizingEndDragLeft(wxControlPoint* pt, double WXUNUSED(x), double
/* /*
if (!eraseIt) if (!eraseIt)
theObject->Show(TRUE); theObject->Show(true);
*/ */
// Recursively redraw links if we have a composite. // Recursively redraw links if we have a composite.
if (theObject->GetChildren().GetCount() > 0) if (theObject->GetChildren().GetCount() > 0)
theObject->DrawLinks(dc, -1, TRUE); theObject->DrawLinks(dc, -1, true);
double width, height; double width, height;
theObject->GetBoundingBoxMax(&width, &height); theObject->GetBoundingBoxMax(&width, &height);

40
contrib/src/ogl/canvas.cpp
View File

@@ -75,7 +75,7 @@ wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,
m_oldDragY = 0; m_oldDragY = 0;
m_firstDragX = 0; m_firstDragX = 0;
m_firstDragY = 0; m_firstDragY = 0;
m_checkTolerance = TRUE; m_checkTolerance = true;
} }
wxShapeCanvas::~wxShapeCanvas() wxShapeCanvas::~wxShapeCanvas()
@@ -129,7 +129,7 @@ void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
// If we've ignored the tolerance once, then ALWAYS ignore // If we've ignored the tolerance once, then ALWAYS ignore
// tolerance in this drag, even if we come back within // tolerance in this drag, even if we come back within
// the tolerance range. // the tolerance range.
m_checkTolerance = FALSE; m_checkTolerance = false;
} }
// Dragging - note that the effect of dragging is left entirely up // Dragging - note that the effect of dragging is left entirely up
@@ -153,16 +153,16 @@ void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
else if (dragging && m_draggedShape && m_dragState == ContinueDraggingLeft) else if (dragging && m_draggedShape && m_dragState == ContinueDraggingLeft)
{ {
// Continue dragging // Continue dragging
m_draggedShape->GetEventHandler()->OnDragLeft(FALSE, m_oldDragX, m_oldDragY, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnDragLeft(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
m_draggedShape->GetEventHandler()->OnDragLeft(TRUE, (double)x, (double)y, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnDragLeft(true, (double)x, (double)y, keys, m_draggedAttachment);
m_oldDragX = x; m_oldDragY = y; m_oldDragX = x; m_oldDragY = y;
} }
else if (event.LeftUp() && m_draggedShape && m_dragState == ContinueDraggingLeft) else if (event.LeftUp() && m_draggedShape && m_dragState == ContinueDraggingLeft)
{ {
m_dragState = NoDragging; m_dragState = NoDragging;
m_checkTolerance = TRUE; m_checkTolerance = true;
m_draggedShape->GetEventHandler()->OnDragLeft(FALSE, m_oldDragX, m_oldDragY, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnDragLeft(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
m_draggedShape->GetEventHandler()->OnEndDragLeft((double)x, (double)y, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnEndDragLeft((double)x, (double)y, keys, m_draggedAttachment);
m_draggedShape = NULL; m_draggedShape = NULL;
@@ -183,16 +183,16 @@ void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
else if (dragging && m_draggedShape && m_dragState == ContinueDraggingRight) else if (dragging && m_draggedShape && m_dragState == ContinueDraggingRight)
{ {
// Continue dragging // Continue dragging
m_draggedShape->GetEventHandler()->OnDragRight(FALSE, m_oldDragX, m_oldDragY, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnDragRight(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
m_draggedShape->GetEventHandler()->OnDragRight(TRUE, (double)x, (double)y, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnDragRight(true, (double)x, (double)y, keys, m_draggedAttachment);
m_oldDragX = x; m_oldDragY = y; m_oldDragX = x; m_oldDragY = y;
} }
else if (event.RightUp() && m_draggedShape && m_dragState == ContinueDraggingRight) else if (event.RightUp() && m_draggedShape && m_dragState == ContinueDraggingRight)
{ {
m_dragState = NoDragging; m_dragState = NoDragging;
m_checkTolerance = TRUE; m_checkTolerance = true;
m_draggedShape->GetEventHandler()->OnDragRight(FALSE, m_oldDragX, m_oldDragY, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnDragRight(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
m_draggedShape->GetEventHandler()->OnEndDragRight((double)x, (double)y, keys, m_draggedAttachment); m_draggedShape->GetEventHandler()->OnEndDragRight((double)x, (double)y, keys, m_draggedAttachment);
m_draggedShape = NULL; m_draggedShape = NULL;
@@ -208,16 +208,16 @@ void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
else if (dragging && !m_draggedShape && m_dragState == ContinueDraggingLeft) else if (dragging && !m_draggedShape && m_dragState == ContinueDraggingLeft)
{ {
// Continue dragging // Continue dragging
OnDragLeft(FALSE, m_oldDragX, m_oldDragY, keys); OnDragLeft(false, m_oldDragX, m_oldDragY, keys);
OnDragLeft(TRUE, (double)x, (double)y, keys); OnDragLeft(true, (double)x, (double)y, keys);
m_oldDragX = x; m_oldDragY = y; m_oldDragX = x; m_oldDragY = y;
} }
else if (event.LeftUp() && !m_draggedShape && m_dragState == ContinueDraggingLeft) else if (event.LeftUp() && !m_draggedShape && m_dragState == ContinueDraggingLeft)
{ {
m_dragState = NoDragging; m_dragState = NoDragging;
m_checkTolerance = TRUE; m_checkTolerance = true;
OnDragLeft(FALSE, m_oldDragX, m_oldDragY, keys); OnDragLeft(false, m_oldDragX, m_oldDragY, keys);
OnEndDragLeft((double)x, (double)y, keys); OnEndDragLeft((double)x, (double)y, keys);
m_draggedShape = NULL; m_draggedShape = NULL;
} }
@@ -230,16 +230,16 @@ void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
else if (dragging && !m_draggedShape && m_dragState == ContinueDraggingRight) else if (dragging && !m_draggedShape && m_dragState == ContinueDraggingRight)
{ {
// Continue dragging // Continue dragging
OnDragRight(FALSE, m_oldDragX, m_oldDragY, keys); OnDragRight(false, m_oldDragX, m_oldDragY, keys);
OnDragRight(TRUE, (double)x, (double)y, keys); OnDragRight(true, (double)x, (double)y, keys);
m_oldDragX = x; m_oldDragY = y; m_oldDragX = x; m_oldDragY = y;
} }
else if (event.RightUp() && !m_draggedShape && m_dragState == ContinueDraggingRight) else if (event.RightUp() && !m_draggedShape && m_dragState == ContinueDraggingRight)
{ {
m_dragState = NoDragging; m_dragState = NoDragging;
m_checkTolerance = TRUE; m_checkTolerance = true;
OnDragRight(FALSE, m_oldDragX, m_oldDragY, keys); OnDragRight(false, m_oldDragX, m_oldDragY, keys);
OnEndDragRight((double)x, (double)y, keys); OnEndDragRight((double)x, (double)y, keys);
m_draggedShape = NULL; m_draggedShape = NULL;
} }
@@ -247,7 +247,7 @@ void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
// Non-dragging events // Non-dragging events
else if (event.IsButton()) else if (event.IsButton())
{ {
m_checkTolerance = TRUE; m_checkTolerance = true;
// Find the nearest object // Find the nearest object
int attachment = 0; int attachment = 0;
@@ -358,7 +358,7 @@ wxShape *wxShapeCanvas::FindFirstSensitiveShape1(wxShape *image, int op)
return NULL; return NULL;
} }
// Helper function: TRUE if 'contains' wholly contains 'contained'. // Helper function: true if 'contains' wholly contains 'contained'.
static bool WhollyContains(wxShape *contains, wxShape *contained) static bool WhollyContains(wxShape *contains, wxShape *contained)
{ {
double xp1, yp1, xp2, yp2; double xp1, yp1, xp2, yp2;

132
contrib/src/ogl/composit.cpp
View File

@@ -65,7 +65,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCompositeShape, wxRectangleShape)
wxCompositeShape::wxCompositeShape(): wxRectangleShape(10.0, 10.0) wxCompositeShape::wxCompositeShape(): wxRectangleShape(10.0, 10.0)
{ {
// selectable = FALSE; // selectable = false;
m_oldX = m_xpos; m_oldX = m_xpos;
m_oldY = m_ypos; m_oldY = m_ypos;
} }
@@ -136,7 +136,7 @@ bool wxCompositeShape::OnMovePre(wxDC& dc, double x, double y, double oldx, doub
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
void wxCompositeShape::OnErase(wxDC& dc) void wxCompositeShape::OnErase(wxDC& dc)
@@ -278,9 +278,9 @@ void wxCompositeShape::SetSize(double w, double h, bool recursive)
// Scale the position first // Scale the position first
double newX = (double)(((object->GetX() - GetX())*xScale) + GetX()); double newX = (double)(((object->GetX() - GetX())*xScale) + GetX());
double newY = (double)(((object->GetY() - GetY())*yScale) + GetY()); double newY = (double)(((object->GetY() - GetY())*yScale) + GetY());
object->Show(FALSE); object->Show(false);
object->Move(dc, newX, newY); object->Move(dc, newX, newY);
object->Show(TRUE); object->Show(true);
// Now set the scaled size // Now set the scaled size
object->GetBoundingBoxMin(&xBound, &yBound); object->GetBoundingBoxMin(&xBound, &yBound);
@@ -371,7 +371,7 @@ void wxCompositeShape::Copy(wxShape& copy)
while (node) while (node)
{ {
wxShape *object = (wxShape *)node->GetData(); wxShape *object = (wxShape *)node->GetData();
wxShape *newObject = object->CreateNewCopy(FALSE, FALSE); wxShape *newObject = object->CreateNewCopy(false, false);
if (newObject->GetId() == 0) if (newObject->GetId() == 0)
newObject->SetId(wxNewId()); newObject->SetId(wxNewId());
@@ -558,7 +558,7 @@ void wxCompositeShape::CalculateSize()
bool wxCompositeShape::Recompute() bool wxCompositeShape::Recompute()
{ {
int noIterations = 0; int noIterations = 0;
bool changed = TRUE; bool changed = true;
while (changed && (noIterations < 500)) while (changed && (noIterations < 500))
{ {
changed = Constrain(); changed = Constrain();
@@ -577,13 +577,13 @@ bool wxCompositeShape::Constrain()
{ {
CalculateSize(); CalculateSize();
bool changed = FALSE; bool changed = false;
wxNode *node = m_children.GetFirst(); wxNode *node = m_children.GetFirst();
while (node) while (node)
{ {
wxShape *object = (wxShape *)node->GetData(); wxShape *object = (wxShape *)node->GetData();
if (object->Constrain()) if (object->Constrain())
changed = TRUE; changed = true;
node = node->GetNext(); node = node->GetNext();
} }
@@ -591,7 +591,7 @@ bool wxCompositeShape::Constrain()
while (node) while (node)
{ {
wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData(); wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
if (constraint->Evaluate()) changed = TRUE; if (constraint->Evaluate()) changed = true;
node = node->GetNext(); node = node->GetNext();
} }
return changed; return changed;
@@ -681,7 +681,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
// Constraints are output as constraint1 = (...), constraint2 = (...), etc. // Constraints are output as constraint1 = (...), constraint2 = (...), etc.
int constraintNo = 1; int constraintNo = 1;
wxChar m_constraintNameBuf[20]; wxChar m_constraintNameBuf[20];
bool haveConstraints = TRUE; bool haveConstraints = true;
while (haveConstraints) while (haveConstraints)
{ {
@@ -690,7 +690,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
clause->GetAttributeValue(m_constraintNameBuf, &constraintExpr); clause->GetAttributeValue(m_constraintNameBuf, &constraintExpr);
if (!constraintExpr) if (!constraintExpr)
{ {
haveConstraints = FALSE; haveConstraints = false;
break; break;
} }
wxString cName = wxEmptyString; wxString cName = wxEmptyString;
@@ -761,7 +761,7 @@ void wxCompositeShape::MakeContainer()
division->Move(dc, GetX(), GetY()); division->Move(dc, GetX(), GetY());
Recompute(); Recompute();
division->Show(TRUE); division->Show(true);
} }
wxDivisionShape *wxCompositeShape::OnCreateDivision() wxDivisionShape *wxCompositeShape::OnCreateDivision()
@@ -782,11 +782,11 @@ wxShape *wxCompositeShape::FindContainerImage()
return NULL; return NULL;
} }
// Returns TRUE if division is a descendant of this container // Returns true if division is a descendant of this container
bool wxCompositeShape::ContainsDivision(wxDivisionShape *division) bool wxCompositeShape::ContainsDivision(wxDivisionShape *division)
{ {
if (m_divisions.Member(division)) if (m_divisions.Member(division))
return TRUE; return true;
wxNode *node = m_children.GetFirst(); wxNode *node = m_children.GetFirst();
while (node) while (node)
{ {
@@ -795,11 +795,11 @@ bool wxCompositeShape::ContainsDivision(wxDivisionShape *division)
{ {
bool ans = ((wxCompositeShape *)child)->ContainsDivision(division); bool ans = ((wxCompositeShape *)child)->ContainsDivision(division);
if (ans) if (ans)
return TRUE; return true;
} }
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
/* /*
@@ -812,8 +812,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDivisionShape, wxCompositeShape)
wxDivisionShape::wxDivisionShape() wxDivisionShape::wxDivisionShape()
{ {
SetSensitivityFilter(OP_CLICK_LEFT | OP_CLICK_RIGHT | OP_DRAG_RIGHT); SetSensitivityFilter(OP_CLICK_LEFT | OP_CLICK_RIGHT | OP_DRAG_RIGHT);
SetCentreResize(FALSE); SetCentreResize(false);
SetAttachmentMode(TRUE); SetAttachmentMode(true);
m_leftSide = NULL; m_leftSide = NULL;
m_rightSide = NULL; m_rightSide = NULL;
m_topSide = NULL; m_topSide = NULL;
@@ -881,7 +881,7 @@ bool wxDivisionShape::OnMovePre(wxDC& dc, double x, double y, double oldx, doubl
object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display); object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
void wxDivisionShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment) void wxDivisionShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
@@ -1026,11 +1026,11 @@ void wxDivisionShape::OnRightClick(double x, double y, int keys, int attachment)
{ {
if (Selected()) if (Selected())
{ {
Select(FALSE); Select(false);
GetParent()->Draw(dc); GetParent()->Draw(dc);
} }
else else
Select(TRUE); Select(true);
} }
} }
*/ */
@@ -1058,7 +1058,7 @@ bool wxDivisionShape::Divide(int direction)
double oldWidth = GetWidth(); double oldWidth = GetWidth();
double oldHeight = GetHeight(); double oldHeight = GetHeight();
if (Selected()) if (Selected())
Select(FALSE); Select(false);
wxClientDC dc(GetCanvas()); wxClientDC dc(GetCanvas());
GetCanvas()->PrepareDC(dc); GetCanvas()->PrepareDC(dc);
@@ -1072,7 +1072,7 @@ bool wxDivisionShape::Divide(int direction)
double newXPos2 = GetX(); double newXPos2 = GetX();
double newYPos2 = (double)(y1 + (3.0*GetHeight()/4.0)); double newYPos2 = (double)(y1 + (3.0*GetHeight()/4.0));
wxDivisionShape *newDivision = compositeParent->OnCreateDivision(); wxDivisionShape *newDivision = compositeParent->OnCreateDivision();
newDivision->Show(TRUE); newDivision->Show(true);
Erase(dc); Erase(dc);
@@ -1123,7 +1123,7 @@ bool wxDivisionShape::Divide(int direction)
double newXPos2 = (double)(x1 + (3.0*GetWidth()/4.0)); double newXPos2 = (double)(x1 + (3.0*GetWidth()/4.0));
double newYPos2 = GetY(); double newYPos2 = GetY();
wxDivisionShape *newDivision = compositeParent->OnCreateDivision(); wxDivisionShape *newDivision = compositeParent->OnCreateDivision();
newDivision->Show(TRUE); newDivision->Show(true);
Erase(dc); Erase(dc);
@@ -1162,7 +1162,7 @@ bool wxDivisionShape::Divide(int direction)
compositeParent->MakeMandatoryControlPoints(); compositeParent->MakeMandatoryControlPoints();
} }
compositeParent->Draw(dc); compositeParent->Draw(dc);
return TRUE; return true;
} }
// Make one control point for every visible line // Make one control point for every visible line
@@ -1295,15 +1295,15 @@ void wxDivisionShape::ResetMandatoryControlPoints()
} }
} }
// Adjust a side, returning FALSE if it's not physically possible. // Adjust a side, returning false if it's not physically possible.
bool wxDivisionShape::AdjustLeft(double left, bool test) bool wxDivisionShape::AdjustLeft(double left, bool test)
{ {
double x2 = (double)(GetX() + (GetWidth()/2.0)); double x2 = (double)(GetX() + (GetWidth()/2.0));
if (left >= x2) if (left >= x2)
return FALSE; return false;
if (test) if (test)
return TRUE; return true;
double newW = x2 - left; double newW = x2 - left;
double newX = (double)(left + newW/2.0); double newX = (double)(left + newW/2.0);
@@ -1314,7 +1314,7 @@ bool wxDivisionShape::AdjustLeft(double left, bool test)
Move(dc, newX, GetY()); Move(dc, newX, GetY());
return TRUE; return true;
} }
bool wxDivisionShape::AdjustTop(double top, bool test) bool wxDivisionShape::AdjustTop(double top, bool test)
@@ -1322,9 +1322,9 @@ bool wxDivisionShape::AdjustTop(double top, bool test)
double y2 = (double)(GetY() + (GetHeight()/2.0)); double y2 = (double)(GetY() + (GetHeight()/2.0));
if (top >= y2) if (top >= y2)
return FALSE; return false;
if (test) if (test)
return TRUE; return true;
double newH = y2 - top; double newH = y2 - top;
double newY = (double)(top + newH/2.0); double newY = (double)(top + newH/2.0);
@@ -1335,7 +1335,7 @@ bool wxDivisionShape::AdjustTop(double top, bool test)
Move(dc, GetX(), newY); Move(dc, GetX(), newY);
return TRUE; return true;
} }
bool wxDivisionShape::AdjustRight(double right, bool test) bool wxDivisionShape::AdjustRight(double right, bool test)
@@ -1343,9 +1343,9 @@ bool wxDivisionShape::AdjustRight(double right, bool test)
double x1 = (double)(GetX() - (GetWidth()/2.0)); double x1 = (double)(GetX() - (GetWidth()/2.0));
if (right <= x1) if (right <= x1)
return FALSE; return false;
if (test) if (test)
return TRUE; return true;
double newW = right - x1; double newW = right - x1;
double newX = (double)(x1 + newW/2.0); double newX = (double)(x1 + newW/2.0);
@@ -1356,7 +1356,7 @@ bool wxDivisionShape::AdjustRight(double right, bool test)
Move(dc, newX, GetY()); Move(dc, newX, GetY());
return TRUE; return true;
} }
bool wxDivisionShape::AdjustBottom(double bottom, bool test) bool wxDivisionShape::AdjustBottom(double bottom, bool test)
@@ -1364,9 +1364,9 @@ bool wxDivisionShape::AdjustBottom(double bottom, bool test)
double y1 = (double)(GetY() - (GetHeight()/2.0)); double y1 = (double)(GetY() - (GetHeight()/2.0));
if (bottom <= y1) if (bottom <= y1)
return FALSE; return false;
if (test) if (test)
return TRUE; return true;
double newH = bottom - y1; double newH = bottom - y1;
double newY = (double)(y1 + newH/2.0); double newY = (double)(y1 + newH/2.0);
@@ -1377,13 +1377,13 @@ bool wxDivisionShape::AdjustBottom(double bottom, bool test)
Move(dc, GetX(), newY); Move(dc, GetX(), newY);
return TRUE; return true;
} }
wxDivisionControlPoint::wxDivisionControlPoint(wxShapeCanvas *the_canvas, wxShape *object, double size, double the_xoffset, double the_yoffset, int the_type): wxDivisionControlPoint::wxDivisionControlPoint(wxShapeCanvas *the_canvas, wxShape *object, double size, double the_xoffset, double the_yoffset, int the_type):
wxControlPoint(the_canvas, object, size, the_xoffset, the_yoffset, the_type) wxControlPoint(the_canvas, object, size, the_xoffset, the_yoffset, the_type)
{ {
SetEraseObject(FALSE); SetEraseObject(false);
} }
wxDivisionControlPoint::~wxDivisionControlPoint() wxDivisionControlPoint::~wxDivisionControlPoint()
@@ -1434,51 +1434,51 @@ void wxDivisionControlPoint::OnEndDragLeft(double x, double y, int keys, int att
double dx2 = (double)(division->GetX() + (division->GetWidth()/2.0)); double dx2 = (double)(division->GetX() + (division->GetWidth()/2.0));
double dy2 = (double)(division->GetY() + (division->GetHeight()/2.0)); double dy2 = (double)(division->GetY() + (division->GetHeight()/2.0));
bool success = TRUE; bool success = true;
switch (division->GetHandleSide()) switch (division->GetHandleSide())
{ {
case DIVISION_SIDE_LEFT: case DIVISION_SIDE_LEFT:
{ {
if ((x <= x1) || (x >= x2) || (x >= dx2)) if ((x <= x1) || (x >= x2) || (x >= dx2))
success = FALSE; success = false;
// Try it out first... // Try it out first...
else if (!division->ResizeAdjoining(DIVISION_SIDE_LEFT, x, TRUE)) else if (!division->ResizeAdjoining(DIVISION_SIDE_LEFT, x, true))
success = FALSE; success = false;
else else
division->ResizeAdjoining(DIVISION_SIDE_LEFT, x, FALSE); division->ResizeAdjoining(DIVISION_SIDE_LEFT, x, false);
break; break;
} }
case DIVISION_SIDE_TOP: case DIVISION_SIDE_TOP:
{ {
if ((y <= y1) || (y >= y2) || (y >= dy2)) if ((y <= y1) || (y >= y2) || (y >= dy2))
success = FALSE; success = false;
else if (!division->ResizeAdjoining(DIVISION_SIDE_TOP, y, TRUE)) else if (!division->ResizeAdjoining(DIVISION_SIDE_TOP, y, true))
success = FALSE; success = false;
else else
division->ResizeAdjoining(DIVISION_SIDE_TOP, y, FALSE); division->ResizeAdjoining(DIVISION_SIDE_TOP, y, false);
break; break;
} }
case DIVISION_SIDE_RIGHT: case DIVISION_SIDE_RIGHT:
{ {
if ((x <= x1) || (x >= x2) || (x <= dx1)) if ((x <= x1) || (x >= x2) || (x <= dx1))
success = FALSE; success = false;
else if (!division->ResizeAdjoining(DIVISION_SIDE_RIGHT, x, TRUE)) else if (!division->ResizeAdjoining(DIVISION_SIDE_RIGHT, x, true))
success = FALSE; success = false;
else else
division->ResizeAdjoining(DIVISION_SIDE_RIGHT, x, FALSE); division->ResizeAdjoining(DIVISION_SIDE_RIGHT, x, false);
break; break;
} }
case DIVISION_SIDE_BOTTOM: case DIVISION_SIDE_BOTTOM:
{ {
if ((y <= y1) || (y >= y2) || (y <= dy1)) if ((y <= y1) || (y >= y2) || (y <= dy1))
success = FALSE; success = false;
else if (!division->ResizeAdjoining(DIVISION_SIDE_BOTTOM, y, TRUE)) else if (!division->ResizeAdjoining(DIVISION_SIDE_BOTTOM, y, true))
success = FALSE; success = false;
else else
division->ResizeAdjoining(DIVISION_SIDE_BOTTOM, y, FALSE); division->ResizeAdjoining(DIVISION_SIDE_BOTTOM, y, false);
break; break;
} }
@@ -1518,7 +1518,7 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
{ {
bool success = division->AdjustRight(newPos, test); bool success = division->AdjustRight(newPos, test);
if (!success && test) if (!success && test)
return FALSE; return false;
} }
break; break;
} }
@@ -1528,7 +1528,7 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
{ {
bool success = division->AdjustBottom(newPos, test); bool success = division->AdjustBottom(newPos, test);
if (!success && test) if (!success && test)
return FALSE; return false;
} }
break; break;
} }
@@ -1538,7 +1538,7 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
{ {
bool success = division->AdjustLeft(newPos, test); bool success = division->AdjustLeft(newPos, test);
if (!success && test) if (!success && test)
return FALSE; return false;
} }
break; break;
} }
@@ -1548,7 +1548,7 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
{ {
bool success = division->AdjustTop(newPos, test); bool success = division->AdjustTop(newPos, test);
if (!success && test) if (!success && test)
return FALSE; return false;
} }
break; break;
} }
@@ -1558,7 +1558,7 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
/* /*
@@ -1694,7 +1694,7 @@ void wxDivisionShape::EditEdge(int WXUNUSED(side))
dialog->Centre(wxBOTH); dialog->Centre(wxBOTH);
wxEndBusyCursor(); wxEndBusyCursor();
dialog->Show(TRUE); dialog->Show(true);
int lineStyle = wxSOLID; int lineStyle = wxSOLID;
if (*pStyle) if (*pStyle)
@@ -1732,13 +1732,13 @@ void wxDivisionShape::PopupMenu(double x, double y)
oglPopupDivisionMenu->SetClientData((void *)this); oglPopupDivisionMenu->SetClientData((void *)this);
if (m_leftSide) if (m_leftSide)
oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, TRUE); oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, true);
else else
oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, FALSE); oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, false);
if (m_topSide) if (m_topSide)
oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, TRUE); oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, true);
else else
oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, FALSE); oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, false);
int x1, y1; int x1, y1;
m_canvas->GetViewStart(&x1, &y1); m_canvas->GetViewStart(&x1, &y1);

100
contrib/src/ogl/constrnt.cpp
View File

@@ -160,7 +160,7 @@ bool wxOGLConstraint::Equals(double a, double b)
return eq; return eq;
} }
// Return TRUE if anything changed // Return true if anything changed
bool wxOGLConstraint::Evaluate() bool wxOGLConstraint::Evaluate()
{ {
double maxWidth, maxHeight, minWidth, minHeight, x, y; double maxWidth, maxHeight, minWidth, minHeight, x, y;
@@ -204,7 +204,7 @@ bool wxOGLConstraint::Evaluate()
} }
// Now position the objects // Now position the objects
bool changed = FALSE; bool changed = false;
node = m_constrainedObjects.GetFirst(); node = m_constrainedObjects.GetFirst();
while (node) while (node)
{ {
@@ -214,8 +214,8 @@ bool wxOGLConstraint::Evaluate()
startY += (double)(spacingY + (height2/2.0)); startY += (double)(spacingY + (height2/2.0));
if (!Equals(startY, constrainedObject->GetY())) if (!Equals(startY, constrainedObject->GetY()))
{ {
constrainedObject->Move(dc, constrainedObject->GetX(), startY, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), startY, false);
changed = TRUE; changed = true;
} }
startY += (double)(height2/2.0); startY += (double)(height2/2.0);
node = node->GetNext(); node = node->GetNext();
@@ -252,7 +252,7 @@ bool wxOGLConstraint::Evaluate()
} }
// Now position the objects // Now position the objects
bool changed = FALSE; bool changed = false;
node = m_constrainedObjects.GetFirst(); node = m_constrainedObjects.GetFirst();
while (node) while (node)
{ {
@@ -262,8 +262,8 @@ bool wxOGLConstraint::Evaluate()
startX += (double)(spacingX + (width2/2.0)); startX += (double)(spacingX + (width2/2.0));
if (!Equals(startX, constrainedObject->GetX())) if (!Equals(startX, constrainedObject->GetX()))
{ {
constrainedObject->Move(dc, startX, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, startX, constrainedObject->GetY(), false);
changed = TRUE; changed = true;
} }
startX += (double)(width2/2.0); startX += (double)(width2/2.0);
node = node->GetNext(); node = node->GetNext();
@@ -318,7 +318,7 @@ bool wxOGLConstraint::Evaluate()
} }
// Now position the objects // Now position the objects
bool changed = FALSE; bool changed = false;
node = m_constrainedObjects.GetFirst(); node = m_constrainedObjects.GetFirst();
while (node) while (node)
{ {
@@ -330,8 +330,8 @@ bool wxOGLConstraint::Evaluate()
if ((!Equals(startX, constrainedObject->GetX())) || (!Equals(startY, constrainedObject->GetY()))) if ((!Equals(startX, constrainedObject->GetX())) || (!Equals(startY, constrainedObject->GetY())))
{ {
constrainedObject->Move(dc, startX, startY, FALSE); constrainedObject->Move(dc, startX, startY, false);
changed = TRUE; changed = true;
} }
startX += (double)(width2/2.0); startX += (double)(width2/2.0);
@@ -343,7 +343,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_LEFT_OF: case gyCONSTRAINT_LEFT_OF:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -356,8 +356,8 @@ bool wxOGLConstraint::Evaluate()
double x3 = (double)(x - (minWidth/2.0) - (width2/2.0) - m_xSpacing); double x3 = (double)(x - (minWidth/2.0) - (width2/2.0) - m_xSpacing);
if (!Equals(x3, constrainedObject->GetX())) if (!Equals(x3, constrainedObject->GetX()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -366,7 +366,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_RIGHT_OF: case gyCONSTRAINT_RIGHT_OF:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -379,8 +379,8 @@ bool wxOGLConstraint::Evaluate()
double x3 = (double)(x + (minWidth/2.0) + (width2/2.0) + m_xSpacing); double x3 = (double)(x + (minWidth/2.0) + (width2/2.0) + m_xSpacing);
if (!Equals(x3, constrainedObject->GetX())) if (!Equals(x3, constrainedObject->GetX()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -389,7 +389,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_ABOVE: case gyCONSTRAINT_ABOVE:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -402,8 +402,8 @@ bool wxOGLConstraint::Evaluate()
double y3 = (double)(y - (minHeight/2.0) - (height2/2.0) - m_ySpacing); double y3 = (double)(y - (minHeight/2.0) - (height2/2.0) - m_ySpacing);
if (!Equals(y3, constrainedObject->GetY())) if (!Equals(y3, constrainedObject->GetY()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -412,7 +412,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_BELOW: case gyCONSTRAINT_BELOW:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -425,8 +425,8 @@ bool wxOGLConstraint::Evaluate()
double y3 = (double)(y + (minHeight/2.0) + (height2/2.0) + m_ySpacing); double y3 = (double)(y + (minHeight/2.0) + (height2/2.0) + m_ySpacing);
if (!Equals(y3, constrainedObject->GetY())) if (!Equals(y3, constrainedObject->GetY()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -435,7 +435,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_ALIGNED_LEFT: case gyCONSTRAINT_ALIGNED_LEFT:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -448,8 +448,8 @@ bool wxOGLConstraint::Evaluate()
double x3 = (double)(x - (minWidth/2.0) + (width2/2.0) + m_xSpacing); double x3 = (double)(x - (minWidth/2.0) + (width2/2.0) + m_xSpacing);
if (!Equals(x3, constrainedObject->GetX())) if (!Equals(x3, constrainedObject->GetX()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -458,7 +458,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_ALIGNED_RIGHT: case gyCONSTRAINT_ALIGNED_RIGHT:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -471,8 +471,8 @@ bool wxOGLConstraint::Evaluate()
double x3 = (double)(x + (minWidth/2.0) - (width2/2.0) - m_xSpacing); double x3 = (double)(x + (minWidth/2.0) - (width2/2.0) - m_xSpacing);
if (!Equals(x3, constrainedObject->GetX())) if (!Equals(x3, constrainedObject->GetX()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -480,12 +480,12 @@ bool wxOGLConstraint::Evaluate()
return changed; return changed;
#if 0 #if 0
// two returned values ? // two returned values ?
return FALSE; return false;
#endif #endif
} }
case gyCONSTRAINT_ALIGNED_TOP: case gyCONSTRAINT_ALIGNED_TOP:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -498,8 +498,8 @@ bool wxOGLConstraint::Evaluate()
double y3 = (double)(y - (minHeight/2.0) + (height2/2.0) + m_ySpacing); double y3 = (double)(y - (minHeight/2.0) + (height2/2.0) + m_ySpacing);
if (!Equals(y3, constrainedObject->GetY())) if (!Equals(y3, constrainedObject->GetY()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -508,7 +508,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_ALIGNED_BOTTOM: case gyCONSTRAINT_ALIGNED_BOTTOM:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -521,8 +521,8 @@ bool wxOGLConstraint::Evaluate()
double y3 = (double)(y + (minHeight/2.0) - (height2/2.0) - m_ySpacing); double y3 = (double)(y + (minHeight/2.0) - (height2/2.0) - m_ySpacing);
if (!Equals(y3, constrainedObject->GetY())) if (!Equals(y3, constrainedObject->GetY()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -531,7 +531,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_MIDALIGNED_LEFT: case gyCONSTRAINT_MIDALIGNED_LEFT:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -541,8 +541,8 @@ bool wxOGLConstraint::Evaluate()
double x3 = (double)(x - (minWidth/2.0)); double x3 = (double)(x - (minWidth/2.0));
if (!Equals(x3, constrainedObject->GetX())) if (!Equals(x3, constrainedObject->GetX()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -551,7 +551,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_MIDALIGNED_RIGHT: case gyCONSTRAINT_MIDALIGNED_RIGHT:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -561,8 +561,8 @@ bool wxOGLConstraint::Evaluate()
double x3 = (double)(x + (minWidth/2.0)); double x3 = (double)(x + (minWidth/2.0));
if (!Equals(x3, constrainedObject->GetX())) if (!Equals(x3, constrainedObject->GetX()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE); constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -570,12 +570,12 @@ bool wxOGLConstraint::Evaluate()
return changed; return changed;
#if 0 #if 0
// two returned values ? // two returned values ?
return FALSE; return false;
#endif #endif
} }
case gyCONSTRAINT_MIDALIGNED_TOP: case gyCONSTRAINT_MIDALIGNED_TOP:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -585,8 +585,8 @@ bool wxOGLConstraint::Evaluate()
double y3 = (double)(y - (minHeight/2.0)); double y3 = (double)(y - (minHeight/2.0));
if (!Equals(y3, constrainedObject->GetY())) if (!Equals(y3, constrainedObject->GetY()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -595,7 +595,7 @@ bool wxOGLConstraint::Evaluate()
} }
case gyCONSTRAINT_MIDALIGNED_BOTTOM: case gyCONSTRAINT_MIDALIGNED_BOTTOM:
{ {
bool changed = FALSE; bool changed = false;
wxNode *node = m_constrainedObjects.GetFirst(); wxNode *node = m_constrainedObjects.GetFirst();
while (node) while (node)
@@ -605,8 +605,8 @@ bool wxOGLConstraint::Evaluate()
double y3 = (double)(y + (minHeight/2.0)); double y3 = (double)(y + (minHeight/2.0));
if (!Equals(y3, constrainedObject->GetY())) if (!Equals(y3, constrainedObject->GetY()))
{ {
changed = TRUE; changed = true;
constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE); constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -616,9 +616,9 @@ bool wxOGLConstraint::Evaluate()
#if 0 #if 0
// default value handled in main function body // default value handled in main function body
default: default:
return FALSE; return false;
#endif #endif
} }
return FALSE; return false;
} }

12
contrib/src/ogl/divided.cpp
View File

@@ -93,7 +93,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc)
if (!formatted) if (!formatted)
{ {
FormatRegionText(); FormatRegionText();
formatted = TRUE; formatted = true;
} }
*/ */
if (GetDisableLabel()) return; if (GetDisableLabel()) return;
@@ -285,10 +285,10 @@ bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y,
{ {
*x = m_xpos; *x = m_xpos;
*y = m_ypos; *y = m_ypos;
return FALSE; return false;
} }
} }
return TRUE; return true;
} }
int wxDividedShape::GetNumberOfAttachments() const int wxDividedShape::GetNumberOfAttachments() const
@@ -317,9 +317,9 @@ bool wxDividedShape::AttachmentIsValid(int attachment) const
return wxShape::AttachmentIsValid(attachment); return wxShape::AttachmentIsValid(attachment);
} }
else if (attachment >= 0) else if (attachment >= 0)
return TRUE; return true;
else else
return FALSE; return false;
} }
void wxDividedShape::Copy(wxShape& copy) void wxDividedShape::Copy(wxShape& copy)
@@ -524,7 +524,7 @@ void wxDividedShape::EditRegions()
wxEndBusyCursor(); wxEndBusyCursor();
dialog->Show(TRUE); dialog->Show(true);
node = GetRegions().GetFirst(); node = GetRegions().GetFirst();
i = 0; i = 0;

28
contrib/src/ogl/drawn.cpp
View File

@@ -51,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDrawnShape, wxRectangleShape)
wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0) wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0)
{ {
m_saveToFile = TRUE; m_saveToFile = true;
m_currentAngle = oglDRAWN_ANGLE_0; m_currentAngle = oglDRAWN_ANGLE_0;
} }
@@ -225,7 +225,7 @@ bool wxDrawnShape::GetPerimeterPoint(double x1, double y1,
wxDrawOp* op = (wxDrawOp*) node->GetData(); wxDrawOp* op = (wxDrawOp*) node->GetData();
if (op->GetPerimeterPoint(x1, y1, x2, y2, x3, y3, GetX(), GetY(), GetAttachmentMode())) if (op->GetPerimeterPoint(x1, y1, x2, y2, x3, y3, GetX(), GetY(), GetAttachmentMode()))
return TRUE; return true;
} }
// Default... just use a rectangle // Default... just use a rectangle
@@ -1209,7 +1209,7 @@ bool wxOpPolyDraw::OnDrawOutline(wxDC& dc, double x, double y, double w, double
} }
dc.DrawPolygon(n, intPoints, (long) x, (long) y); dc.DrawPolygon(n, intPoints, (long) x, (long) y);
delete[] intPoints; delete[] intPoints;
return TRUE; return true;
} }
// Assume (x1, y1) is centre of box (most generally, line end at box) // Assume (x1, y1) is centre of box (most generally, line end at box)
@@ -1239,13 +1239,13 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
{ {
*x3 = point->x + xOffset; *x3 = point->x + xOffset;
*y3 = point->y + yOffset; *y3 = point->y + yOffset;
return TRUE; return true;
} }
else if ((y2 < y1) && (point->y < 0.0)) else if ((y2 < y1) && (point->y < 0.0))
{ {
*x3 = point->x + xOffset; *x3 = point->x + xOffset;
*y3 = point->y + yOffset; *y3 = point->y + yOffset;
return TRUE; return true;
} }
} }
} }
@@ -1267,7 +1267,7 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
delete[] xpoints; delete[] xpoints;
delete[] ypoints; delete[] ypoints;
return TRUE; return true;
} }
@@ -1363,7 +1363,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPseudoMetaFile, wxObject)
wxPseudoMetaFile::wxPseudoMetaFile() wxPseudoMetaFile::wxPseudoMetaFile()
{ {
m_currentRotation = 0; m_currentRotation = 0;
m_rotateable = TRUE; m_rotateable = true;
m_width = 0.0; m_width = 0.0;
m_height = 0.0; m_height = 0.0;
m_outlinePen = NULL; m_outlinePen = NULL;
@@ -1602,7 +1602,7 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
// Read GDI objects // Read GDI objects
wxChar buf[50]; wxChar buf[50];
int i = 1; int i = 1;
bool keepGoing = TRUE; bool keepGoing = true;
while (keepGoing) while (keepGoing)
{ {
wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i); wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i);
@@ -1610,7 +1610,7 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
clause->GetAttributeValue(buf, &expr); clause->GetAttributeValue(buf, &expr);
if (!expr) if (!expr)
{ {
keepGoing = FALSE; keepGoing = false;
} }
else else
{ {
@@ -1667,7 +1667,7 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
} }
// Now read in the operations // Now read in the operations
keepGoing = TRUE; keepGoing = true;
i = 1; i = 1;
while (keepGoing) while (keepGoing)
{ {
@@ -1676,7 +1676,7 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
clause->GetAttributeValue(buf, &expr); clause->GetAttributeValue(buf, &expr);
if (!expr) if (!expr)
{ {
keepGoing = FALSE; keepGoing = false;
} }
else else
{ {
@@ -1821,14 +1821,14 @@ void wxPseudoMetaFile::Copy(wxPseudoMetaFile& copy)
bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth, double *rheight) bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth, double *rheight)
{ {
if (!wxFileExists(filename)) if (!wxFileExists(filename))
return FALSE; return false;
wxXMetaFile *metaFile = new wxXMetaFile; wxXMetaFile *metaFile = new wxXMetaFile;
if (!metaFile->ReadFile(filename)) if (!metaFile->ReadFile(filename))
{ {
delete metaFile; delete metaFile;
return FALSE; return false;
} }
double lastX = 0.0; double lastX = 0.0;
@@ -2165,7 +2165,7 @@ bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth
m_height = *rheight; m_height = *rheight;
delete metaFile; delete metaFile;
return TRUE; return true;
} }
// Scale to fit size // Scale to fit size

100
contrib/src/ogl/lines.cpp
View File

@@ -45,7 +45,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxLineShape, wxShape)
wxLineShape::wxLineShape() wxLineShape::wxLineShape()
{ {
m_sensitivity = OP_CLICK_LEFT | OP_CLICK_RIGHT; m_sensitivity = OP_CLICK_LEFT | OP_CLICK_RIGHT;
m_draggable = FALSE; m_draggable = false;
m_attachmentTo = 0; m_attachmentTo = 0;
m_attachmentFrom = 0; m_attachmentFrom = 0;
/* /*
@@ -54,11 +54,11 @@ wxLineShape::wxLineShape()
*/ */
m_from = NULL; m_from = NULL;
m_to = NULL; m_to = NULL;
m_erasing = FALSE; m_erasing = false;
m_arrowSpacing = 5.0; // For the moment, don't bother saving this to file. m_arrowSpacing = 5.0; // For the moment, don't bother saving this to file.
m_ignoreArrowOffsets = FALSE; m_ignoreArrowOffsets = false;
m_isSpline = FALSE; m_isSpline = false;
m_maintainStraightLines = FALSE; m_maintainStraightLines = false;
m_alignmentStart = 0; m_alignmentStart = 0;
m_alignmentEnd = 0; m_alignmentEnd = 0;
@@ -97,7 +97,7 @@ wxLineShape::~wxLineShape()
{ {
if (m_labelObjects[i]) if (m_labelObjects[i])
{ {
m_labelObjects[i]->Select(FALSE); m_labelObjects[i]->Select(false);
m_labelObjects[i]->RemoveFromCanvas(m_canvas); m_labelObjects[i]->RemoveFromCanvas(m_canvas);
delete m_labelObjects[i]; delete m_labelObjects[i];
m_labelObjects[i] = NULL; m_labelObjects[i] = NULL;
@@ -144,7 +144,7 @@ wxNode *wxLineShape::InsertLineControlPoint(wxDC* dc)
bool wxLineShape::DeleteLineControlPoint() bool wxLineShape::DeleteLineControlPoint()
{ {
if (m_lineControlPoints->GetCount() < 3) if (m_lineControlPoints->GetCount() < 3)
return FALSE; return false;
wxNode *last = m_lineControlPoints->GetLast(); wxNode *last = m_lineControlPoints->GetLast();
wxNode *second_last = last->GetPrevious(); wxNode *second_last = last->GetPrevious();
@@ -153,7 +153,7 @@ bool wxLineShape::DeleteLineControlPoint()
delete second_last_point; delete second_last_point;
delete second_last; delete second_last;
return TRUE; return true;
} }
void wxLineShape::Initialise() void wxLineShape::Initialise()
@@ -242,7 +242,7 @@ void wxLineShape::FormatText(wxDC& dc, const wxString& s, int i)
EraseRegion(dc, region, xx, yy); EraseRegion(dc, region, xx, yy);
if (m_labelObjects[i]) if (m_labelObjects[i])
{ {
m_labelObjects[i]->Select(FALSE, &dc); m_labelObjects[i]->Select(false, &dc);
m_labelObjects[i]->Erase(dc); m_labelObjects[i]->Erase(dc);
m_labelObjects[i]->SetSize(actualW, actualH); m_labelObjects[i]->SetSize(actualW, actualH);
} }
@@ -251,13 +251,13 @@ void wxLineShape::FormatText(wxDC& dc, const wxString& s, int i)
if (m_labelObjects[i]) if (m_labelObjects[i])
{ {
m_labelObjects[i]->Select(TRUE, & dc); m_labelObjects[i]->Select(true, & dc);
m_labelObjects[i]->Draw(dc); m_labelObjects[i]->Draw(dc);
} }
} }
} }
oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW, actualH, region->GetFormatMode()); oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW, actualH, region->GetFormatMode());
m_formatted = TRUE; m_formatted = true;
} }
void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y) void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y)
@@ -464,10 +464,10 @@ void wxLineShape::SetAttachments(int from_attach, int to_attach)
bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance) bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
{ {
if (!m_lineControlPoints) if (!m_lineControlPoints)
return FALSE; return false;
// Look at label regions in case mouse is over a label // Look at label regions in case mouse is over a label
bool inLabelRegion = FALSE; bool inLabelRegion = false;
for (int i = 0; i < 3; i ++) for (int i = 0; i < 3; i ++)
{ {
wxNode *regionNode = m_regions.Item(i); wxNode *regionNode = m_regions.Item(i);
@@ -489,7 +489,7 @@ bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
double rBottom = (double)(cy + (ch/2.0)); double rBottom = (double)(cy + (ch/2.0));
if (x > rLeft && x < rRight && y > rTop && y < rBottom) if (x > rLeft && x < rRight && y > rTop && y < rBottom)
{ {
inLabelRegion = TRUE; inLabelRegion = true;
i = 3; i = 3;
} }
} }
@@ -520,12 +520,12 @@ bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
{ {
*attachment = 0; *attachment = 0;
*distance = distance_from_seg; *distance = distance_from_seg;
return TRUE; return true;
} }
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
void wxLineShape::DrawArrows(wxDC& dc) void wxLineShape::DrawArrows(wxDC& dc)
@@ -545,10 +545,10 @@ void wxLineShape::DrawArrows(wxDC& dc)
{ {
if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets) if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
// If specified, x offset is proportional to line length // If specified, x offset is proportional to line length
DrawArrow(dc, arrow, arrow->GetXOffset(), TRUE); DrawArrow(dc, arrow, arrow->GetXOffset(), true);
else else
{ {
DrawArrow(dc, arrow, startArrowPos, FALSE); // Absolute distance DrawArrow(dc, arrow, startArrowPos, false); // Absolute distance
startArrowPos += arrow->GetSize() + arrow->GetSpacing(); startArrowPos += arrow->GetSize() + arrow->GetSpacing();
} }
break; break;
@@ -556,10 +556,10 @@ void wxLineShape::DrawArrows(wxDC& dc)
case ARROW_POSITION_END: case ARROW_POSITION_END:
{ {
if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets) if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
DrawArrow(dc, arrow, arrow->GetXOffset(), TRUE); DrawArrow(dc, arrow, arrow->GetXOffset(), true);
else else
{ {
DrawArrow(dc, arrow, endArrowPos, FALSE); DrawArrow(dc, arrow, endArrowPos, false);
endArrowPos += arrow->GetSize() + arrow->GetSpacing(); endArrowPos += arrow->GetSize() + arrow->GetSpacing();
} }
break; break;
@@ -568,10 +568,10 @@ void wxLineShape::DrawArrows(wxDC& dc)
{ {
arrow->SetXOffset(middleArrowPos); arrow->SetXOffset(middleArrowPos);
if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets) if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
DrawArrow(dc, arrow, arrow->GetXOffset(), TRUE); DrawArrow(dc, arrow, arrow->GetXOffset(), true);
else else
{ {
DrawArrow(dc, arrow, middleArrowPos, FALSE); DrawArrow(dc, arrow, middleArrowPos, false);
middleArrowPos += arrow->GetSize() + arrow->GetSpacing(); middleArrowPos += arrow->GetSize() + arrow->GetSpacing();
} }
break; break;
@@ -879,10 +879,10 @@ void wxLineShape::OnErase(wxDC& dc)
} }
else else
{ {
m_erasing = TRUE; m_erasing = true;
GetEventHandler()->OnDraw(dc); GetEventHandler()->OnDraw(dc);
GetEventHandler()->OnEraseControlPoints(dc); GetEventHandler()->OnEraseControlPoints(dc);
m_erasing = FALSE; m_erasing = false;
} }
if (old_pen) SetPen(old_pen); if (old_pen) SetPen(old_pen);
@@ -1018,7 +1018,7 @@ bool wxLineShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double o
m_labelObjects[i]->Move(dc, xp+xr, yp+yr); m_labelObjects[i]->Move(dc, xp+xr, yp+yr);
} }
} }
return TRUE; return true;
} }
void wxLineShape::OnMoveLink(wxDC& dc, bool moveControlPoints) void wxLineShape::OnMoveLink(wxDC& dc, bool moveControlPoints)
@@ -1109,7 +1109,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE) if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
{ {
int nth, no_arcs; int nth, no_arcs;
FindNth(m_from, &nth, &no_arcs, FALSE); // Not incoming FindNth(m_from, &nth, &no_arcs, false); // Not incoming
m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this); m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
} }
else else
@@ -1120,7 +1120,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE) if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
{ {
int nth, no_arcs; int nth, no_arcs;
FindNth(m_to, &nth, &no_arcs, TRUE); // Incoming FindNth(m_to, &nth, &no_arcs, true); // Incoming
m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this); m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
} }
else else
@@ -1138,7 +1138,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE) if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
{ {
int nth, no_arcs; int nth, no_arcs;
FindNth(m_from, &nth, &no_arcs, FALSE); FindNth(m_from, &nth, &no_arcs, false);
m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this); m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
fromX = end_x; fromX = end_x;
fromY = end_y; fromY = end_y;
@@ -1147,7 +1147,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE) if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
{ {
int nth, no_arcs; int nth, no_arcs;
FindNth(m_to, &nth, &no_arcs, TRUE); FindNth(m_to, &nth, &no_arcs, true);
m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this); m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
toX = other_end_x; toX = other_end_x;
toY = other_end_y; toY = other_end_y;
@@ -1652,16 +1652,16 @@ void wxLineShape::Select(bool select, wxDC* dc)
GetLabelPosition(i, &xx, &yy); GetLabelPosition(i, &xx, &yy);
if (m_labelObjects[i]) if (m_labelObjects[i])
{ {
m_labelObjects[i]->Select(FALSE); m_labelObjects[i]->Select(false);
m_labelObjects[i]->RemoveFromCanvas(m_canvas); m_labelObjects[i]->RemoveFromCanvas(m_canvas);
delete m_labelObjects[i]; delete m_labelObjects[i];
} }
m_labelObjects[i] = OnCreateLabelShape(this, region, w, h); m_labelObjects[i] = OnCreateLabelShape(this, region, w, h);
m_labelObjects[i]->AddToCanvas(m_canvas); m_labelObjects[i]->AddToCanvas(m_canvas);
m_labelObjects[i]->Show(TRUE); m_labelObjects[i]->Show(true);
if (dc) if (dc)
m_labelObjects[i]->Move(*dc, (double)(x + xx), (double)(y + yy)); m_labelObjects[i]->Move(*dc, (double)(x + xx), (double)(y + yy));
m_labelObjects[i]->Select(TRUE, dc); m_labelObjects[i]->Select(true, dc);
} }
} }
} }
@@ -1672,7 +1672,7 @@ void wxLineShape::Select(bool select, wxDC* dc)
{ {
if (m_labelObjects[i]) if (m_labelObjects[i])
{ {
m_labelObjects[i]->Select(FALSE, dc); m_labelObjects[i]->Select(false, dc);
m_labelObjects[i]->Erase(*dc); m_labelObjects[i]->Erase(*dc);
m_labelObjects[i]->RemoveFromCanvas(m_canvas); m_labelObjects[i]->RemoveFromCanvas(m_canvas);
delete m_labelObjects[i]; delete m_labelObjects[i];
@@ -1754,7 +1754,7 @@ void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), doub
lineShape->SetPen(& dottedPen); lineShape->SetPen(& dottedPen);
lineShape->SetBrush(wxTRANSPARENT_BRUSH); lineShape->SetBrush(wxTRANSPARENT_BRUSH);
lineShape->GetEventHandler()->OnMoveLink(dc, FALSE); lineShape->GetEventHandler()->OnMoveLink(dc, false);
lineShape->SetPen(old_pen); lineShape->SetPen(old_pen);
lineShape->SetBrush(old_brush); lineShape->SetBrush(old_brush);
@@ -1789,7 +1789,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,
lineShape->GetTo()->OnDraw(dc); lineShape->GetTo()->OnDraw(dc);
lineShape->GetTo()->OnDrawContents(dc); lineShape->GetTo()->OnDrawContents(dc);
this->SetDisableLabel(TRUE); this->SetDisableLabel(true);
dc.SetLogicalFunction(OGLRBLF); dc.SetLogicalFunction(OGLRBLF);
lpt->m_xpos = x; lpt->m_ypos = y; lpt->m_xpos = x; lpt->m_ypos = y;
@@ -1802,7 +1802,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,
lineShape->SetPen(& dottedPen); lineShape->SetPen(& dottedPen);
lineShape->SetBrush(wxTRANSPARENT_BRUSH); lineShape->SetBrush(wxTRANSPARENT_BRUSH);
lineShape->GetEventHandler()->OnMoveLink(dc, FALSE); lineShape->GetEventHandler()->OnMoveLink(dc, false);
lineShape->SetPen(old_pen); lineShape->SetPen(old_pen);
lineShape->SetBrush(old_brush); lineShape->SetBrush(old_brush);
@@ -1822,7 +1822,7 @@ void wxLineShape::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, in
wxClientDC dc(GetCanvas()); wxClientDC dc(GetCanvas());
GetCanvas()->PrepareDC(dc); GetCanvas()->PrepareDC(dc);
this->SetDisableLabel(FALSE); this->SetDisableLabel(false);
wxLineShape *lineShape = (wxLineShape *)this; wxLineShape *lineShape = (wxLineShape *)this;
if (lpt->m_type == CONTROL_POINT_LINE) if (lpt->m_type == CONTROL_POINT_LINE)
@@ -1891,7 +1891,7 @@ bool wxLineShape::OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, co
GetEventHandler()->OnMoveLink(dc); GetEventHandler()->OnMoveLink(dc);
return TRUE; return true;
} }
// Implement movement of endpoint to a new attachment // Implement movement of endpoint to a new attachment
@@ -2023,7 +2023,7 @@ bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int
wxNode *refNode = referenceList.GetFirst(); wxNode *refNode = referenceList.GetFirst();
wxNode *currNode = m_arcArrows.GetFirst(); wxNode *currNode = m_arcArrows.GetFirst();
wxString targetName(arrow->GetName()); wxString targetName(arrow->GetName());
if (!refNode) return FALSE; if (!refNode) return false;
// First check whether we need to insert in front of list, // First check whether we need to insert in front of list,
// because this arrowhead is the first in the reference // because this arrowhead is the first in the reference
@@ -2032,7 +2032,7 @@ bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int
if (refArrow->GetName() == targetName) if (refArrow->GetName() == targetName)
{ {
m_arcArrows.Insert(arrow); m_arcArrows.Insert(arrow);
return TRUE; return true;
} }
wxArrowHead *currArrow = (wxArrowHead *)currNode->GetData(); wxArrowHead *currArrow = (wxArrowHead *)currNode->GetData();
@@ -2057,12 +2057,12 @@ bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int
m_arcArrows.Insert(currNode, arrow); m_arcArrows.Insert(currNode, arrow);
else else
m_arcArrows.Append(arrow); m_arcArrows.Append(arrow);
return TRUE; return true;
} }
refNode = refNode->GetNext(); refNode = refNode->GetNext();
} }
m_arcArrows.Append(arrow); m_arcArrows.Append(arrow);
return TRUE; return true;
} }
void wxLineShape::ClearArrowsAtPosition(int end) void wxLineShape::ClearArrowsAtPosition(int end)
@@ -2122,11 +2122,11 @@ bool wxLineShape::ClearArrow(const wxString& name)
{ {
delete arrow; delete arrow;
delete node; delete node;
return TRUE; return true;
} }
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
/* /*
@@ -2177,11 +2177,11 @@ bool wxLineShape::DeleteArrowHead(int position, const wxString& name)
{ {
delete arrow; delete arrow;
delete node; delete node;
return TRUE; return true;
} }
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
// Overloaded DeleteArrowHead: pass arrowhead id. // Overloaded DeleteArrowHead: pass arrowhead id.
@@ -2195,11 +2195,11 @@ bool wxLineShape::DeleteArrowHead(long id)
{ {
delete arrow; delete arrow;
delete node; delete node;
return TRUE; return true;
} }
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
/* /*
@@ -2331,7 +2331,7 @@ wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
return (wxRealPoint *)node->GetData(); return (wxRealPoint *)node->GetData();
} }
else else
return FALSE; return NULL;
} }
/* /*
@@ -2496,7 +2496,7 @@ bool wxLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, d
labelShape->FormatText(dc, s, i); labelShape->FormatText(dc, s, i);
DrawRegion(dc, labelShape->m_shapeRegion, xx, yy); DrawRegion(dc, labelShape->m_shapeRegion, xx, yy);
} }
return TRUE; return true;
} }
// Divert left and right clicks to line object // Divert left and right clicks to line object

14
contrib/src/ogl/mfutils.cpp
View File

@@ -92,7 +92,7 @@ wxMetaRecord::~wxMetaRecord(void)
wxXMetaFile::wxXMetaFile(const wxChar *file) wxXMetaFile::wxXMetaFile(const wxChar *file)
{ {
ok = FALSE; ok = false;
top = 0.0; top = 0.0;
bottom = 0.0; bottom = 0.0;
left = 0.0; left = 0.0;
@@ -159,7 +159,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
HandleTableSize = 0; HandleTableSize = 0;
FILE *handle = wxFopen(file, wxT("rb")); FILE *handle = wxFopen(file, wxT("rb"));
if (!handle) return FALSE; if (!handle) return false;
// Read placeable metafile header, if any // Read placeable metafile header, if any
long key = getint(handle); long key = getint(handle);
@@ -196,7 +196,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
if (mtType != 1 && mtType != 2) if (mtType != 1 && mtType != 2)
{ {
fclose(handle); fclose(handle);
return FALSE; return false;
} }
/* int mtHeaderSize = */ getshort(handle); /* int mtHeaderSize = */ getshort(handle);
@@ -205,7 +205,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
if (mtVersion != 0x0300 && mtVersion != 0x0100) if (mtVersion != 0x0300 && mtVersion != 0x0100)
{ {
fclose(handle); fclose(handle);
return FALSE; return false;
} }
/* long mtSize = */ getint(handle); /* long mtSize = */ getint(handle);
@@ -723,7 +723,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
} }
} }
fclose(handle); fclose(handle);
return TRUE; return true;
} }
wxXMetaFile::~wxXMetaFile(void) wxXMetaFile::~wxXMetaFile(void)
@@ -741,7 +741,7 @@ wxXMetaFile::~wxXMetaFile(void)
bool wxXMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height)) bool wxXMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
{ {
return FALSE; return false;
} }
bool wxXMetaFile::Play(wxDC *dc) bool wxXMetaFile::Play(wxDC *dc)
@@ -1082,6 +1082,6 @@ bool wxXMetaFile::Play(wxDC *dc)
} }
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }

28
contrib/src/ogl/ogldiag.cpp
View File

@@ -45,8 +45,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDiagram, wxObject)
wxDiagram::wxDiagram() wxDiagram::wxDiagram()
{ {
m_diagramCanvas = NULL; m_diagramCanvas = NULL;
m_quickEditMode = FALSE; m_quickEditMode = false;
m_snapToGrid = TRUE; m_snapToGrid = true;
m_gridSpacing = 5.0; m_gridSpacing = 5.0;
m_shapeList = new wxList; m_shapeList = new wxList;
m_mouseTolerance = DEFAULT_MOUSE_TOLERANCE; m_mouseTolerance = DEFAULT_MOUSE_TOLERANCE;
@@ -250,7 +250,7 @@ bool wxDiagram::SaveFile(const wxString& filename)
{ {
wxEndBusyCursor(); wxEndBusyCursor();
delete database; delete database;
return FALSE; return false;
} }
database->Write(file); database->Write(file);
@@ -285,7 +285,7 @@ bool wxDiagram::SaveFile(const wxString& filename)
} }
wxEndBusyCursor(); wxEndBusyCursor();
return TRUE; return true;
} }
bool wxDiagram::LoadFile(const wxString& filename) bool wxDiagram::LoadFile(const wxString& filename)
@@ -296,7 +296,7 @@ bool wxDiagram::LoadFile(const wxString& filename)
if (!database.Read(filename)) if (!database.Read(filename))
{ {
wxEndBusyCursor(); wxEndBusyCursor();
return FALSE; return false;
} }
DeleteAllShapes(); DeleteAllShapes();
@@ -326,7 +326,7 @@ bool wxDiagram::LoadFile(const wxString& filename)
wxEndBusyCursor(); wxEndBusyCursor();
return TRUE; return true;
} }
void wxDiagram::ReadNodes(wxExprDatabase& database) void wxDiagram::ReadNodes(wxExprDatabase& database)
@@ -348,7 +348,7 @@ void wxDiagram::ReadNodes(wxExprDatabase& database)
OnShapeLoad(database, *shape, *clause); OnShapeLoad(database, *shape, *clause);
shape->SetCanvas(GetCanvas()); shape->SetCanvas(GetCanvas());
shape->Show(TRUE); shape->Show(true);
m_shapeList->Append(shape); m_shapeList->Append(shape);
@@ -389,7 +389,7 @@ void wxDiagram::ReadLines(wxExprDatabase& database)
if (classInfo) if (classInfo)
{ {
wxLineShape *shape = (wxLineShape *)classInfo->CreateObject(); wxLineShape *shape = (wxLineShape *)classInfo->CreateObject();
shape->Show(TRUE); shape->Show(true);
OnShapeLoad(database, *shape, *clause); OnShapeLoad(database, *shape, *clause);
shape->SetCanvas(GetCanvas()); shape->SetCanvas(GetCanvas());
@@ -519,12 +519,12 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
// Allow for modifying file // Allow for modifying file
bool wxDiagram::OnDatabaseLoad(wxExprDatabase& WXUNUSED(db)) bool wxDiagram::OnDatabaseLoad(wxExprDatabase& WXUNUSED(db))
{ {
return TRUE; return true;
} }
bool wxDiagram::OnDatabaseSave(wxExprDatabase& WXUNUSED(db)) bool wxDiagram::OnDatabaseSave(wxExprDatabase& WXUNUSED(db))
{ {
return TRUE; return true;
} }
bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr) bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
@@ -544,23 +544,23 @@ bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
} }
} }
return TRUE; return true;
} }
bool wxDiagram::OnShapeLoad(wxExprDatabase& WXUNUSED(db), wxShape& shape, wxExpr& expr) bool wxDiagram::OnShapeLoad(wxExprDatabase& WXUNUSED(db), wxShape& shape, wxExpr& expr)
{ {
shape.ReadAttributes(&expr); shape.ReadAttributes(&expr);
return TRUE; return true;
} }
bool wxDiagram::OnHeaderSave(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr)) bool wxDiagram::OnHeaderSave(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
{ {
return TRUE; return true;
} }
bool wxDiagram::OnHeaderLoad(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr)) bool wxDiagram::OnHeaderLoad(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
{ {
return TRUE; return true;
} }
#endif #endif

16
contrib/src/ogl/oglmisc.cpp
View File

@@ -384,7 +384,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
// Make new lines into NULL strings at this point // Make new lines into NULL strings at this point
int i = 0; int j = 0; int len = text.Length(); int i = 0; int j = 0; int len = text.Length();
wxChar word[200]; word[0] = 0; wxChar word[200]; word[0] = 0;
bool end_word = FALSE; bool new_line = FALSE; bool end_word = false; bool new_line = false;
while (i < len) while (i < len)
{ {
switch (text[i]) switch (text[i])
@@ -397,7 +397,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
else else
{ {
if (text[i] == wxT('n')) if (text[i] == wxT('n'))
{ new_line = TRUE; end_word = TRUE; i++; } { new_line = true; end_word = true; i++; }
else else
{ word[j] = wxT('%'); j ++; word[j] = text[i]; j ++; i ++; } { word[j] = wxT('%'); j ++; word[j] = text[i]; j ++; i ++; }
} }
@@ -405,17 +405,17 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
} }
case 10: case 10:
{ {
new_line = TRUE; end_word = TRUE; i++; new_line = true; end_word = true; i++;
break; break;
} }
case 13: case 13:
{ {
new_line = TRUE; end_word = TRUE; i++; new_line = true; end_word = true; i++;
break; break;
} }
case wxT(' '): case wxT(' '):
{ {
end_word = TRUE; end_word = true;
i ++; i ++;
break; break;
} }
@@ -426,18 +426,18 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
break; break;
} }
} }
if (i == len) end_word = TRUE; if (i == len) end_word = true;
if (end_word) if (end_word)
{ {
word[j] = 0; word[j] = 0;
j = 0; j = 0;
word_list.Add(word); word_list.Add(word);
end_word = FALSE; end_word = false;
} }
if (new_line) if (new_line)
{ {
word_list.Append(NULL); word_list.Append(NULL);
new_line = FALSE; new_line = false;
} }
} }
// Now, make a list of strings which can fit in the box // Now, make a list of strings which can fit in the box