X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..e8332ccfe0cf1653b257d46d5c41339e2b2da438:/contrib/include/wx/ogl/basicp.h diff --git a/contrib/include/wx/ogl/basicp.h b/contrib/include/wx/ogl/basicp.h index aa1067764f..c4dd09b985 100644 --- a/contrib/include/wx/ogl/basicp.h +++ b/contrib/include/wx/ogl/basicp.h @@ -6,23 +6,24 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _OGL_BASICP_H_ #define _OGL_BASICP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "basicp.h" #endif + #define CONTROL_POINT_SIZE 6 -class wxShapeTextLine: public wxObject +class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject { DECLARE_DYNAMIC_CLASS(wxShapeTextLine) public: - wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = ""); + wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = wxEmptyString); ~wxShapeTextLine(); inline double GetX() const { return m_x; } @@ -40,13 +41,13 @@ protected: double m_y; }; -class wxShape; -class wxControlPoint: public wxRectangleShape +class WXDLLIMPEXP_OGL wxShape; +class WXDLLIMPEXP_OGL wxControlPoint: public wxRectangleShape { DECLARE_DYNAMIC_CLASS(wxControlPoint) - friend class wxShapeEvtHandler; - friend class wxShape; + friend class WXDLLIMPEXP_OGL wxShapeEvtHandler; + friend class WXDLLIMPEXP_OGL wxShape; public: wxControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, double the_xoffset = 0.0, @@ -72,7 +73,7 @@ public: double m_yoffset; wxShape* m_shape; 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 @@ -88,11 +89,11 @@ public: static double sm_controlPointDragPosY; }; -class wxPolygonShape; -class wxPolygonControlPoint: public wxControlPoint +class WXDLLIMPEXP_OGL wxPolygonShape; +class WXDLLIMPEXP_OGL wxPolygonControlPoint: public wxControlPoint { DECLARE_DYNAMIC_CLASS(wxPolygonControlPoint) - friend class wxPolygonShape; + friend class WXDLLIMPEXP_OGL wxPolygonShape; public: wxPolygonControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, wxRealPoint *vertex = NULL, double the_xoffset = 0.0, double the_yoffset = 0.0); @@ -123,7 +124,7 @@ public: * */ -class wxShapeRegion: public wxObject +class WXDLLIMPEXP_OGL wxShapeRegion: public wxObject { DECLARE_DYNAMIC_CLASS(wxShapeRegion) @@ -136,7 +137,8 @@ class wxShapeRegion: public wxObject ~wxShapeRegion(); // Accessors - inline void SetText(const wxString& s) { m_regionText = s; } + inline void SetText(const wxString& s) + { m_regionText = s; } void SetFont(wxFont *f); void SetMinSize(double w, double h); void SetSize(double w, double h); @@ -155,7 +157,7 @@ class wxShapeRegion: public wxObject inline int GetFormatMode() const { return m_formatMode; } inline wxString GetName() const { return m_regionName; } inline wxString GetColour() const { return m_textColour; } - wxColour *GetActualColourObject(); + wxColour GetActualColourObject(); inline wxList& GetFormattedText() { return m_formattedText; } inline wxString GetPenColour() const { return m_penColour; } inline int GetPenStyle() const { return m_penStyle; } @@ -186,7 +188,7 @@ public: int m_formatMode; // FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT | FORMAT_NONE wxString m_regionName; wxString m_textColour; - wxColour* m_actualColourObject; // For speed purposes + wxColour m_actualColourObject; // For speed purposes // New members for specifying divided rectangle division colour/style 30/6/94 wxString m_penColour; @@ -199,7 +201,7 @@ public: * User-defined attachment point */ -class wxAttachmentPoint: public wxObject +class WXDLLIMPEXP_OGL wxAttachmentPoint: public wxObject { DECLARE_DYNAMIC_CLASS(wxAttachmentPoint)