X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..e8332ccfe0cf1653b257d46d5c41339e2b2da438:/contrib/include/wx/ogl/drawn.h diff --git a/contrib/include/wx/ogl/drawn.h b/contrib/include/wx/ogl/drawn.h index dafde44d21..26527799c9 100644 --- a/contrib/include/wx/ogl/drawn.h +++ b/contrib/include/wx/ogl/drawn.h @@ -6,7 +6,7 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _OGL_DRAWN_H_ @@ -16,13 +16,12 @@ #pragma interface "drawn.h" #endif -#include #define oglMETAFLAGS_OUTLINE 1 #define oglMETAFLAGS_ATTACHMENTS 2 -class wxDrawnShape; -class wxPseudoMetaFile: public wxObject +class WXDLLIMPEXP_OGL wxDrawnShape; +class WXDLLIMPEXP_OGL wxPseudoMetaFile: public wxObject { DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile) public: @@ -48,7 +47,7 @@ class wxPseudoMetaFile: public wxObject // Rotate about the given axis by theta radians from the x axis. void Rotate(double x, double y, double theta); - bool LoadFromMetaFile(char *filename, double *width, double *height); + bool LoadFromMetaFile(const wxString& filename, double *width, double *height); void GetBounds(double *minX, double *minY, double *maxX, double *maxY); @@ -74,7 +73,7 @@ class wxPseudoMetaFile: public wxObject inline wxList& GetOps() const { return (wxList&) m_ops; } // Is this a valid (non-empty) metafile? - inline bool IsValid() const { return (m_ops.Number() > 0); } + inline bool IsValid() const { return (m_ops.GetCount() > 0); } public: /// Set of functions for drawing into a pseudo metafile. @@ -101,8 +100,8 @@ public: virtual void SetClippingRect(const wxRect& rect); virtual void DestroyClippingRect(); - virtual void SetPen(wxPen* pen, bool isOutline = FALSE); // TODO: eventually, just store GDI object attributes, not actual - virtual void SetBrush(wxBrush* brush, bool isFill = FALSE); // pens/brushes etc. + virtual void SetPen(wxPen* pen, bool isOutline = false); // TODO: eventually, just store GDI object attributes, not actual + virtual void SetBrush(wxBrush* brush, bool isFill = false); // pens/brushes etc. virtual void SetFont(wxFont* font); virtual void SetTextColour(const wxColour& colour); virtual void SetBackgroundColour(const wxColour& colour); @@ -130,7 +129,7 @@ public: #define oglDRAWN_ANGLE_180 2 #define oglDRAWN_ANGLE_270 3 -class wxDrawnShape: public wxRectangleShape +class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape { DECLARE_DYNAMIC_CLASS(wxDrawnShape) public: @@ -156,8 +155,8 @@ class wxDrawnShape: public wxRectangleShape // Get current rotation inline double GetRotation() const { return m_rotation; } - void SetSize(double w, double h, bool recursive = TRUE); - bool LoadFromMetaFile(char *filename); + void SetSize(double w, double h, bool recursive = true); + bool LoadFromMetaFile(const wxString& filename); inline void SetSaveToFile(bool save) { m_saveToFile = save; } inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; } @@ -189,8 +188,8 @@ class wxDrawnShape: public wxRectangleShape virtual void SetClippingRect(const wxRect& rect); virtual void DestroyClippingRect(); - 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 SetDrawnPen(wxPen* pen, bool isOutline = false); // TODO: eventually, just store GDI object attributes, not actual + virtual void SetDrawnBrush(wxBrush* brush, bool isFill = false); // pens/brushes etc. virtual void SetDrawnFont(wxFont* font); virtual void SetDrawnTextColour(const wxColour& colour); virtual void SetDrawnBackgroundColour(const wxColour& colour);