1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

[wxWidgets.git] / src / msw / mslu.cpp

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index 3e63d04fb25b795fa8739dd9bca36ab74d77d245..b34c033f121d9be62641cb47ef50f2ba85f24c86 100644 (file)
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -23,18 +19,28 @@
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

+//------------------------------------------------------------------------
+// Check for use of MSLU

 //------------------------------------------------------------------------
 
 //------------------------------------------------------------------------
 

-#if !wxUSE_UNICODE_MSLU
+#if wxUSE_BASE

 
 

-bool wxUsingUnicowsDll()
-{ 
-    return false; 
+bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
+{
+#if wxUSE_UNICODE_MSLU
+    return (wxGetOsVersion() == wxWIN95);
+#else
+    return false;
+#endif

 }
 
 }
 

-#else
+#endif // wxUSE_BASE
+
+
+#if wxUSE_UNICODE_MSLU

 
 //------------------------------------------------------------------------
 //
 
 //------------------------------------------------------------------------
 //


@@ -65,13 +71,6 @@ bool wxUsingUnicowsDll()
 #undef GetOpenFileNameW
 #undef GetSaveFileNameW
 
 #undef GetOpenFileNameW
 #undef GetSaveFileNameW
 

-// Returns true if we are running under Unicode emulation in Win9x environment.
-// Workaround hacks take effect only if this condition is met
-bool wxUsingUnicowsDll()
-{
-    return (wxGetOsVersion() == wxWIN95);
-}
-

 //------------------------------------------------------------------------
 // Wrongly implemented functions from unicows.dll
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 // Wrongly implemented functions from unicows.dll
 //------------------------------------------------------------------------


@@ -166,6 +165,14 @@ WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name)
         return _tremove(name);
 }
 
         return _tremove(name);
 }
 

+WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode)
+{
+    if ( wxUsingUnicowsDll() )
+        return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
+    else
+        return _tfopen(name,mode);
+}
+

 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
     || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
     || ( defined(__MWERKS__) && defined(__WXMSW__) ) \