use CXXFLAGS instead of CFLAGS in several places now that the tests are done using...

[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 83d292f8d50edbd88bd7888550dd7e48f22c340a..ee0b249a4e6b728b35aca7dbacfacfbad8fc9684 100644 (file)
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -6,25 +6,20 @@
 // 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_
 #define _OGL_OGLDIAG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_OGLDIAG_H_
 #define _OGL_OGLDIAG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "ogldiag.h"
-#endif
-
-#include <wx/deprecated/setup.h>
+#include "wx/ogl/basic.h"

 
 #if wxUSE_PROLOGIO
 
 #if wxUSE_PROLOGIO

-#include <wx/deprecated/wxexpr.h>
+#include "wx/deprecated/wxexpr.h"

 #endif
 
 #endif
 

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

 
 

-class wxDiagram: public wxObject
+class WXDLLIMPEXP_OGL wxDiagram: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxDiagram)
 
 {
  DECLARE_DYNAMIC_CLASS(wxDiagram)
 


@@ -99,7 +94,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; }


@@ -112,7 +107,7 @@ public:
     wxLineShape*    m_lineShape2;
 };
 
     wxLineShape*    m_lineShape2;
 };
 

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

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