Generic file dialog presentation. Regenerated makefiles.

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

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_OGLDIAG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_OGLDIAG_H_


@@ -16,9 +16,14 @@
 #pragma interface "ogldiag.h"
 #endif
 
 #pragma interface "ogldiag.h"
 #endif
 

-#include <wx/ogl/basic.h>
+#include "wx/ogl/basic.h"

 
 

-class wxDiagram: public wxObject
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif
+
+
+class WXDLLIMPEXP_OGL wxDiagram: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxDiagram)
 
 {
  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 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);
 
 
   // 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);
 
   virtual bool SaveFile(const wxString& filename);
   virtual bool LoadFile(const wxString& filename);
 


@@ -93,7 +98,7 @@ protected:
   wxList*               m_shapeList;
 };
 
   wxList*               m_shapeList;
 };
 

-class wxLineCrossing: public wxObject
+class WXDLLIMPEXP_OGL wxLineCrossing: public wxObject

 {
 public:
     wxLineCrossing() { m_lineShape1 = NULL; m_lineShape2 = NULL; }
 {
 public:
     wxLineCrossing() { m_lineShape1 = NULL; m_lineShape2 = NULL; }


@@ -106,7 +111,7 @@ public:
     wxLineShape*    m_lineShape2;
 };
 
     wxLineShape*    m_lineShape2;
 };
 

-class wxLineCrossings: public wxObject
+class WXDLLIMPEXP_OGL wxLineCrossings: public wxObject

 {
 public:
     wxLineCrossings();
 {
 public:
     wxLineCrossings();