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

Some of these are not in BASE, cahnge back to WXDLLEXPORT

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-08-26 04:58:43 +00:00
parent 5c95e9a2cf
commit 2679196c7e
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

13
src/msw/mslu.cpp
View File

@@ -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 )