Trying hard to make things compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,16 +16,11 @@
|
|||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/wxchar.h"
|
#include "wx/wxchar.h"
|
||||||
|
|
||||||
#if !wxUSE_UNICODE_MSLU
|
//------------------------------------------------------------------------
|
||||||
inline bool wxUsingUnicowsDll() { return false; }
|
|
||||||
#else
|
|
||||||
|
|
||||||
// Returns true if we are running under Unicode emulation in Win9x environment.
|
WXDLLEXPORT bool wxUsingUnicowsDll();
|
||||||
// Workaround hacks take effect only if this condition is met
|
|
||||||
inline bool wxUsingUnicowsDll()
|
#if wxUSE_UNICODE_MSLU
|
||||||
{
|
|
||||||
return (wxGetOsVersion() == wxWIN95);
|
|
||||||
}
|
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
// Wrongly implemented functions from unicows.dll
|
// Wrongly implemented functions from unicows.dll
|
||||||
|
@@ -25,7 +25,16 @@
|
|||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_UNICODE_MSLU
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if !wxUSE_UNICODE_MSLU
|
||||||
|
|
||||||
|
bool wxUsingUnicowsDll()
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
@@ -56,6 +65,13 @@
|
|||||||
#undef GetOpenFileNameW
|
#undef GetOpenFileNameW
|
||||||
#undef GetSaveFileNameW
|
#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
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user