From eac90854bd92def117248aa59927289b7e1d5c6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 17 Jul 2003 08:31:33 +0000 Subject: [PATCH] compilation fixes for msw_gl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 11 ++++------- include/wx/msw/glcanvas.h | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 51e07843f8..f2e95d4aff 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -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 diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h index b8dab7af65..a12a47b6c1 100644 --- a/include/wx/msw/glcanvas.h +++ b/include/wx/msw/glcanvas.h @@ -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: -- 2.47.2