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

21
contrib/include/wx/ogl/basicp.h
View File

@@ -16,9 +16,10 @@
#pragma interface "basicp.h"
#endif
#define CONTROL_POINT_SIZE 6
class wxShapeTextLine: public wxObject
class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
public:
@@ -40,13 +41,13 @@ protected:
double m_y;
};
class wxShape;
class wxControlPoint: public wxRectangleShape
class WXDLLIMPEXP_OGL wxShape;
class WXDLLIMPEXP_OGL wxControlPoint: public wxRectangleShape
{
DECLARE_DYNAMIC_CLASS(wxControlPoint)
friend class wxShapeEvtHandler;
friend class wxShape;
friend class WXDLLIMPEXP_OGL wxShapeEvtHandler;
friend class WXDLLIMPEXP_OGL wxShape;
public:
wxControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, double the_xoffset = 0.0,
@@ -88,11 +89,11 @@ public:
static double sm_controlPointDragPosY;
};
class wxPolygonShape;
class wxPolygonControlPoint: public wxControlPoint
class WXDLLIMPEXP_OGL wxPolygonShape;
class WXDLLIMPEXP_OGL wxPolygonControlPoint: public wxControlPoint
{
DECLARE_DYNAMIC_CLASS(wxPolygonControlPoint)
friend class wxPolygonShape;
friend class WXDLLIMPEXP_OGL wxPolygonShape;
public:
wxPolygonControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, wxRealPoint *vertex = NULL,
double the_xoffset = 0.0, double the_yoffset = 0.0);
@@ -123,7 +124,7 @@ public:
*
*/
class wxShapeRegion: public wxObject
class WXDLLIMPEXP_OGL wxShapeRegion: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxShapeRegion)
@@ -200,7 +201,7 @@ public:
* User-defined attachment point
*/
class wxAttachmentPoint: public wxObject
class WXDLLIMPEXP_OGL wxAttachmentPoint: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxAttachmentPoint)