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

compilation fixes for msw_gl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-17 08:31:33 +00:00
parent 3e5c3c83e5
commit eac90854bd
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/defs.h
View File

@@ -403,15 +403,12 @@ typedef int wxWindowID;
#define WXDLLIMPEXP_DATA_CORE(type) type
#endif
#ifdef WXMAKINGDLL_HTML
#define WXDLLIMPEXP_HTML WXEXPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
#ifdef WXMAKINGDLL_GL
#define WXDLLIMPEXP_GL WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_HTML WXIMPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type
#define WXDLLIMPEXP_GL WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_HTML
#define WXDLLIMPEXP_DATA_HTML(type) type
#define WXDLLIMPEXP_GL
#endif
// for backwards compatibility, define suffix-less versions too

6
include/wx/msw/glcanvas.h
View File

@@ -52,9 +52,9 @@ enum
WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
};
class WXDLLEXPORT wxGLCanvas; /* forward reference */
class WXDLLIMPEXP_GL wxGLCanvas; /* forward reference */
class WXDLLEXPORT wxGLContext: public wxObject
class WXDLLIMPEXP_GL wxGLContext: public wxObject
{
public:
wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
@@ -80,7 +80,7 @@ public:
wxWindow* m_window;
};
class WXDLLEXPORT wxGLCanvas: public wxWindow
class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow
{
DECLARE_CLASS(wxGLCanvas)
public: