Better fix

[wxWidgets.git] / include / wx / palmos / mslu.h

diff --git a/include/wx/palmos/mslu.h b/include/wx/palmos/mslu.h
index 176a3d5120eeb2f0518798a4708c63f0d898351e..084e5d74e8bd7ed2794b8c9cc00c461787e070e5 100644 (file)
--- a/include/wx/palmos/mslu.h
+++ b/include/wx/palmos/mslu.h
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/mslu.h
 // Purpose:     Fixes for bugs in MSLU
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/mslu.h
 // Purpose:     Fixes for bugs in MSLU

-// Author:      Vaclav Slavik
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Modified by:

-// Created:     2002/02/17
+// Created:     10/13/04

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 2002 Vaclav Slavik
+// Copyright:   (c) William Osborne

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,10 +14,10 @@
 
 #include "wx/defs.h"
 #include "wx/utils.h"
 
 #include "wx/defs.h"
 #include "wx/utils.h"

-#include "wx/wxchar.h"
+#include "wx/chartype.h"

 
 #if !wxUSE_UNICODE_MSLU
 
 #if !wxUSE_UNICODE_MSLU

-inline bool wxUsingUnicowsDll() { return FALSE; }
+inline bool wxUsingUnicowsDll() { return false; }

 #else
 
 // Returns true if we are running under Unicode emulation in Win9x environment.
 #else
 
 // Returns true if we are running under Unicode emulation in Win9x environment.


@@ -33,9 +33,9 @@ inline bool wxUsingUnicowsDll()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, 
-                                  WXLPARAM lData, WXWPARAM wData, 
-                                  int x, int y, int cx, int cy, 
+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);
 #define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
                                   unsigned int flags);
 #define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \


@@ -56,17 +56,6 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
 WXDLLEXPORT int wxMSLU__tremove(const wxChar *name);
 
 WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
 WXDLLEXPORT int wxMSLU__tremove(const wxChar *name);
 

-#if defined( __VISUALC__ ) \
-    || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
-    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
-WXDLLEXPORT int wxMSLU__wopen(const wxChar *name, int flags, int mode);
-WXDLLEXPORT int wxMSLU__waccess(const wxChar *name, int mode);
-WXDLLEXPORT int wxMSLU__wmkdir(const wxChar *name);
-WXDLLEXPORT int wxMSLU__wrmdir(const wxChar *name);
-WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer);
-#endif
-

 #endif // wxUSE_UNICODE_MSLU
 
 #endif // _WX_MSLU_H_
 #endif // wxUSE_UNICODE_MSLU
 
 #endif // _WX_MSLU_H_