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 a289d3472997d4c59ab4034400d2193f5db50014..50d33b92bc784120b1d9aa8879543d6d3df6d025 100644 (file)
--- a/include/wx/msw/mslu.h
+++ b/include/wx/msw/mslu.h
@@ -33,7 +33,7 @@ inline bool wxUsingUnicowsDll()
 
 #if wxUSE_GUI
 
 
 #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);
                                   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)
 
     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)
 
 #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
 #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
 
 #endif

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index f604482fe469bd303e2d6660399db457d55241fb..87b44207d088659d87954269a8049c9eab0698d5 100644 (file)
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -62,11 +62,10 @@
 
 #if wxUSE_GUI
 
 
 #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
 {
     // 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
 }
 
 #endif
 }
 

-WXDLLIMPEXP_BASE int wxMSLU_GetOpenFileNameW(void *ofn)
+WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn)

 {
     int ret = GetOpenFileName((LPOPENFILENAME)ofn);
     if ( wxUsingUnicowsDll() && ret != 0 )
 {
     int ret = GetOpenFileName((LPOPENFILENAME)ofn);
     if ( wxUsingUnicowsDll() && ret != 0 )


@@ -118,7 +117,7 @@ WXDLLIMPEXP_BASE int wxMSLU_GetOpenFileNameW(void *ofn)
     return ret;
 }
 
     return ret;
 }
 

-WXDLLIMPEXP_BASE int wxMSLU_GetSaveFileNameW(void *ofn)
+WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)

 {
     int ret = GetSaveFileName((LPOPENFILENAME)ofn);
     if ( wxUsingUnicowsDll() && ret != 0 )
 {
     int ret = GetSaveFileName((LPOPENFILENAME)ofn);
     if ( wxUsingUnicowsDll() && ret != 0 )