X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..749a05ee85ea5453f155454e4640ebf795233ad3:/contrib/include/wx/ogl/ogldiag.h diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h index 0444911f79..eb31799330 100644 --- a/contrib/include/wx/ogl/ogldiag.h +++ b/contrib/include/wx/ogl/ogldiag.h @@ -6,19 +6,24 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _OGL_OGLDIAG_H_ #define _OGL_OGLDIAG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "ogldiag.h" #endif -#include +#include "wx/ogl/basic.h" -class wxDiagram: public wxObject +#if wxUSE_PROLOGIO +#include +#endif + + +class WXDLLIMPEXP_OGL wxDiagram: public wxObject { DECLARE_DYNAMIC_CLASS(wxDiagram) @@ -62,12 +67,12 @@ public: inline void SetMouseTolerance(int tol) { m_mouseTolerance = tol; } inline int GetMouseTolerance() const { return m_mouseTolerance; } inline wxList *GetShapeList() const { return m_shapeList; } - inline int GetCount() const { return m_shapeList->Number(); } + inline int GetCount() const { return m_shapeList->GetCount(); } // Make sure all text that should be centred, is centred. void RecentreAll(wxDC& dc); -#ifdef PROLOGIO +#if wxUSE_PROLOGIO virtual bool SaveFile(const wxString& filename); virtual bool LoadFile(const wxString& filename); @@ -93,7 +98,7 @@ protected: wxList* m_shapeList; }; -class wxLineCrossing: public wxObject +class WXDLLIMPEXP_OGL wxLineCrossing: public wxObject { public: wxLineCrossing() { m_lineShape1 = NULL; m_lineShape2 = NULL; } @@ -106,7 +111,7 @@ public: wxLineShape* m_lineShape2; }; -class wxLineCrossings: public wxObject +class WXDLLIMPEXP_OGL wxLineCrossings: public wxObject { public: wxLineCrossings();