From 3135f4a7785f188af291c35ce5df6bdd13672300 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 29 Oct 1999 22:18:20 +0000 Subject: [PATCH] Added WXDLLEXPORT to wxWndProc definition so wxGLCanvas could be used with wxWindows DLL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/app.cpp | 6 +++--- src/msw/window.cpp | 4 ++-- utils/glcanvas/win/glcanvas.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 76ef09c046..a03d31788a 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -127,7 +127,7 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); +LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); #if defined(__WIN95__) && !defined(__TWIN32__) #define wxUSE_RICHEDIT 1 @@ -555,7 +555,7 @@ void wxApp::CleanUp() if (wxWinHandleList) delete wxWinHandleList; - // GL: I'm annoyed ... I don't know where to put this and I don't want to + // GL: I'm annoyed ... I don't know where to put this and I don't want to // create a module for that as it's part of the core. delete wxPendingEvents; #if wxUSE_THREADS @@ -956,7 +956,7 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg) while ( hWnd && !wndThis ) { hWnd = ::GetParent(hWnd); - wndThis = wxFindWinFromHandle((WXHWND)hWnd); + wndThis = wxFindWinFromHandle((WXHWND)hWnd); } // Try translations first; find the youngest window with diff --git a/src/msw/window.cpp b/src/msw/window.cpp index a5f6e4cef2..0459634737 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -126,7 +126,7 @@ extern wxChar wxCanvasClassName[]; // --------------------------------------------------------------------------- // the window proc for all our windows -LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, +LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); #ifdef __WXDEBUG__ @@ -1709,7 +1709,7 @@ void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam, wxWindow *wxWndHook = NULL; // Main window proc -LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { // trace all messages - useful for the debugging #ifdef __WXDEBUG__ diff --git a/utils/glcanvas/win/glcanvas.cpp b/utils/glcanvas/win/glcanvas.cpp index 48651358b6..bbd7d026b9 100644 --- a/utils/glcanvas/win/glcanvas.cpp +++ b/utils/glcanvas/win/glcanvas.cpp @@ -29,7 +29,7 @@ wxChar wxGLCanvasClassName[] = wxT("wxGLCanvasClass"); -LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, +LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); /* @@ -48,8 +48,8 @@ wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette) wglMakeCurrent((HDC) m_hDC, m_glContext); } -wxGLContext::wxGLContext( - bool isRGB, wxGLCanvas *win, +wxGLContext::wxGLContext( + bool isRGB, wxGLCanvas *win, const wxPalette& palette, const wxGLContext *other /* for sharing display lists */ ) @@ -139,13 +139,13 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id, m_glContext = new wxGLContext(TRUE, this, palette); } -wxGLCanvas::wxGLCanvas( wxWindow *parent, +wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, int *attribList, const wxPalette& palette ) : wxScrolledWindow() // : wxScrolledWindow(parent, id, pos, size, style, name) -{ +{ bool ret = Create(parent, id, pos, size, style, name); if ( ret )