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

15
contrib/include/wx/ogl/basic.h
View File

@@ -16,6 +16,7 @@
#pragma interface "basic.h"
#endif
#define OGL_VERSION 2.0
#ifndef DEFAULT_MOUSE_TOLERANCE
@@ -119,7 +120,7 @@ class WXDLLEXPORT wxExprDatabase;
class wxShapeEvtHandler: public wxObject, public wxClientDataContainer
class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataContainer
{
DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler)
@@ -184,7 +185,7 @@ class wxShapeEvtHandler: public wxObject, public wxClientDataContainer
wxShape* m_handlerShape;
};
class wxShape: public wxShapeEvtHandler
class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
{
DECLARE_ABSTRACT_CLASS(wxShape)
@@ -561,7 +562,7 @@ class wxShape: public wxShapeEvtHandler
long m_branchStyle;
};
class wxPolygonShape: public wxShape
class WXDLLIMPEXP_OGL wxPolygonShape: public wxShape
{
DECLARE_DYNAMIC_CLASS(wxPolygonShape)
public:
@@ -634,7 +635,7 @@ class wxPolygonShape: public wxShape
double m_originalHeight;
};
class wxRectangleShape: public wxShape
class WXDLLIMPEXP_OGL wxRectangleShape: public wxShape
{
DECLARE_DYNAMIC_CLASS(wxRectangleShape)
public:
@@ -669,7 +670,7 @@ protected:
double m_cornerRadius;
};
class wxTextShape: public wxRectangleShape
class WXDLLIMPEXP_OGL wxTextShape: public wxRectangleShape
{
DECLARE_DYNAMIC_CLASS(wxTextShape)
public:
@@ -685,7 +686,7 @@ class wxTextShape: public wxRectangleShape
void Copy(wxShape& copy);
};
class wxEllipseShape: public wxShape
class WXDLLIMPEXP_OGL wxEllipseShape: public wxShape
{
DECLARE_DYNAMIC_CLASS(wxEllipseShape)
public:
@@ -722,7 +723,7 @@ protected:
double m_height;
};
class wxCircleShape: public wxEllipseShape
class WXDLLIMPEXP_OGL wxCircleShape: public wxEllipseShape
{
DECLARE_DYNAMIC_CLASS(wxCircleShape)
public: