From: Robin Dunn Date: Thu, 26 Aug 2004 04:58:43 +0000 (+0000) Subject: Some of these are not in BASE, cahnge back to WXDLLEXPORT X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2679196c7e7e919d4a15bec7d931a054e62c413f?ds=inline Some of these are not in BASE, cahnge back to WXDLLEXPORT git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h index a289d34729..50d33b92bc 100644 --- a/include/wx/msw/mslu.h +++ b/include/wx/msw/mslu.h @@ -33,7 +33,7 @@ inline bool wxUsingUnicowsDll() #if wxUSE_GUI -WXDLLIMPEXP_BASE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, +WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, WXLPARAM lData, WXWPARAM wData, int x, int y, int cx, int cy, unsigned int flags); @@ -41,10 +41,10 @@ WXDLLIMPEXP_BASE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFu wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \ ld, wd, x, y, cx, cy, flags) -WXDLLIMPEXP_BASE int wxMSLU_GetOpenFileNameW(void *ofn); +WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn); #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn) -WXDLLIMPEXP_BASE int wxMSLU_GetSaveFileNameW(void *ofn); +WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn) #endif diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp index f604482fe4..87b44207d0 100644 --- a/src/msw/mslu.cpp +++ b/src/msw/mslu.cpp @@ -62,11 +62,10 @@ #if wxUSE_GUI -WXDLLIMPEXP_BASE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, - WXFARPROC outputFunc, - WXLPARAM lData, WXWPARAM wData, - int x, int y, int cx, int cy, - unsigned int flags) +WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, + WXLPARAM lData, WXWPARAM wData, + int x, int y, int cx, int cy, + unsigned int flags) { // VS: There's yet another bug in MSLU: DrawStateW behaves like if it was // expecting char*, not wchar_t* input. We have to use DrawStateA @@ -110,7 +109,7 @@ static void wxFixOPENFILENAME(LPOPENFILENAME ofn) #endif } -WXDLLIMPEXP_BASE int wxMSLU_GetOpenFileNameW(void *ofn) +WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn) { int ret = GetOpenFileName((LPOPENFILENAME)ofn); if ( wxUsingUnicowsDll() && ret != 0 ) @@ -118,7 +117,7 @@ WXDLLIMPEXP_BASE int wxMSLU_GetOpenFileNameW(void *ofn) return ret; } -WXDLLIMPEXP_BASE int wxMSLU_GetSaveFileNameW(void *ofn) +WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn) { int ret = GetSaveFileName((LPOPENFILENAME)ofn); if ( wxUsingUnicowsDll() && ret != 0 )