[#1472076] Fixes after stock gdi changes within core library.

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

diff --git a/contrib/include/wx/ogl/ogl.h b/contrib/include/wx/ogl/ogl.h
index a9eb003abef16b5ea3d624b25588ab875079f979..14ef4cb9fefbe26cfa836671b9ed22ea6bbc0242 100644 (file)
--- a/contrib/include/wx/ogl/ogl.h
+++ b/contrib/include/wx/ogl/ogl.h
@@ -6,22 +6,40 @@
 // 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_OGL_H_
 #define _OGL_OGL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_OGL_H_
 #define _OGL_OGL_H_
 

-#include <wx/ogl/basic.h>      // Basic shapes
-#include <wx/ogl/lines.h>      // Lines and splines
-#include <wx/ogl/divided.h>    // Vertically-divided rectangle
-#include <wx/ogl/composit.h>   // Composite images
-#include <wx/ogl/canvas.h>     // wxShapeCanvas for displaying objects
-#include <wx/ogl/ogldiag.h>    // wxDiagram
+#ifdef WXMAKINGDLL_OGL
+    #define WXDLLIMPEXP_OGL WXEXPORT
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_OGL WXIMPORT
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_OGL
+#endif
+
+
+#include "wx/ogl/basic.h"      // Basic shapes
+#include "wx/ogl/basicp.h"
+#include "wx/ogl/lines.h"      // Lines and splines
+#include "wx/ogl/linesp.h"
+#include "wx/ogl/divided.h"    // Vertically-divided rectangle
+#include "wx/ogl/composit.h"   // Composite images
+#include "wx/ogl/canvas.h"     // wxShapeCanvas for displaying objects
+#include "wx/ogl/ogldiag.h"    // wxDiagram
+
+#include "wx/ogl/bmpshape.h"
+#include "wx/ogl/constrnt.h"
+#include "wx/ogl/drawn.h"
+#include "wx/ogl/drawnp.h"
+#include "wx/ogl/mfutils.h"
+#include "wx/ogl/misc.h"

 
 // TODO: replace with wxModule implementation
 
 // TODO: replace with wxModule implementation

-extern void wxOGLInitialize();
-extern void wxOGLCleanUp();
+extern WXDLLIMPEXP_OGL void wxOGLInitialize();
+extern WXDLLIMPEXP_OGL void wxOGLCleanUp();

 
 #endif
  // _OGL_OGL_H_
 
 #endif
  // _OGL_OGL_H_