fixed MSVC compilation and warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index 8e1dea110df4a6fb8f0b38536244bcfdcf4239c3..1fa85b050bb8c893674683e1c7787909b09d2d6a 100644 (file)
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -50,6 +50,9 @@
     #include <sys/stat.h>
 #endif
 
     #include <sys/stat.h>
 #endif
 

+#ifdef __VISUALC__
+    #include <direct.h>
+#endif

 
 // Undef redirection macros defined in wx/msw/mslu.h:
 #undef DrawStateW
 
 // Undef redirection macros defined in wx/msw/mslu.h:
 #undef DrawStateW


@@ -62,7 +65,7 @@
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-WXDLLEXPORT bool 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)


@@ -109,17 +112,17 @@ static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
 #endif
 }
 
 #endif
 }
 

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

 {
 {

-    bool ret = GetOpenFileName((LPOPENFILENAME)ofn);
+    int ret = GetOpenFileName((LPOPENFILENAME)ofn);

     if ( wxUsingUnicowsDll() && ret != 0 )
         wxFixOPENFILENAME((LPOPENFILENAME)ofn);
     return ret;
 }
 
     if ( wxUsingUnicowsDll() && ret != 0 )
         wxFixOPENFILENAME((LPOPENFILENAME)ofn);
     return ret;
 }
 

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

 {
 {

-    bool ret = GetSaveFileName((LPOPENFILENAME)ofn);
+    int ret = GetSaveFileName((LPOPENFILENAME)ofn);

     if ( wxUsingUnicowsDll() && ret != 0 )
         wxFixOPENFILENAME((LPOPENFILENAME)ofn);
     return ret;
     if ( wxUsingUnicowsDll() && ret != 0 )
         wxFixOPENFILENAME((LPOPENFILENAME)ofn);
     return ret;