Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to allow OGL building as a DLL

Browse Source 
Also removed the hack I put in last week to allow building without the
deprecated headers and fixed it the right way.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-25 21:20:57 +00:00
parent d772bf4341
commit 5f331691d4
29 changed files with 138 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
contrib/include/wx/ogl/ogl.h
View File

@@ -12,16 +12,34 @@
#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
extern void wxOGLInitialize();
extern void wxOGLCleanUp();
extern WXDLLIMPEXP_OGL void wxOGLInitialize();
extern WXDLLIMPEXP_OGL void wxOGLCleanUp();
#endif
// _OGL_OGL_H_