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

Added WXDLLEXPORT to wxWndProc definition so wxGLCanvas could be used

Browse Source 
with wxWindows DLL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1999-10-29 22:18:20 +00:00
parent b32c6ff062
commit 3135f4a778
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/app.cpp
View File

@ -127,7 +127,7 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
HBRUSH wxDisableButtonBrush = (HBRUSH) 0; HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
#if defined(__WIN95__) && !defined(__TWIN32__) #if defined(__WIN95__) && !defined(__TWIN32__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
@ -555,7 +555,7 @@ void wxApp::CleanUp()
if (wxWinHandleList) if (wxWinHandleList)
delete 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. // create a module for that as it's part of the core.
delete wxPendingEvents; delete wxPendingEvents;
#if wxUSE_THREADS #if wxUSE_THREADS
@ -956,7 +956,7 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
while ( hWnd && !wndThis ) while ( hWnd && !wndThis )
{ {
hWnd = ::GetParent(hWnd); hWnd = ::GetParent(hWnd);
wndThis = wxFindWinFromHandle((WXHWND)hWnd); wndThis = wxFindWinFromHandle((WXHWND)hWnd);
} }
// Try translations first; find the youngest window with // Try translations first; find the youngest window with

4
src/msw/window.cpp
View File

@ -126,7 +126,7 @@ extern wxChar wxCanvasClassName[];
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// the window proc for all our windows // 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); WPARAM wParam, LPARAM lParam);
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@ -1709,7 +1709,7 @@ void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
wxWindow *wxWndHook = NULL; wxWindow *wxWndHook = NULL;
// Main window proc // 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 // trace all messages - useful for the debugging
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__

10
utils/glcanvas/win/glcanvas.cpp
View File

@ -29,7 +29,7 @@
wxChar wxGLCanvasClassName[] = wxT("wxGLCanvasClass"); 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); WPARAM wParam, LPARAM lParam);
/* /*
@ -48,8 +48,8 @@ wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette)
wglMakeCurrent((HDC) m_hDC, m_glContext); wglMakeCurrent((HDC) m_hDC, m_glContext);
} }
wxGLContext::wxGLContext( wxGLContext::wxGLContext(
bool isRGB, wxGLCanvas *win, bool isRGB, wxGLCanvas *win,
const wxPalette& palette, const wxPalette& palette,
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
) )
@ -139,13 +139,13 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
m_glContext = new wxGLContext(TRUE, this, palette); m_glContext = new wxGLContext(TRUE, this, palette);
} }
wxGLCanvas::wxGLCanvas( wxWindow *parent, wxGLCanvas::wxGLCanvas( wxWindow *parent,
const wxGLContext *shared, wxWindowID id, const wxGLContext *shared, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name, const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList, const wxPalette& palette ) int *attribList, const wxPalette& palette )
: wxScrolledWindow() : wxScrolledWindow()
// : wxScrolledWindow(parent, id, pos, size, style, name) // : wxScrolledWindow(parent, id, pos, size, style, name)
{ {
bool ret = Create(parent, id, pos, size, style, name); bool ret = Create(parent, id, pos, size, style, name);
if ( ret ) if ( ret )