partially reverted Robert's changes, did it more cleanly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2fd47df61e
commit
7eb872f4d6
@ -16,16 +16,17 @@
|
||||
#include "wx/utils.h"
|
||||
#include "wx/wxchar.h"
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
WXDLLEXPORT bool wxUsingUnicowsDll();
|
||||
|
||||
#if wxUSE_UNICODE_MSLU
|
||||
// Returns true if we are running under Unicode emulation in Win9x environment.
|
||||
// Workaround hacks take effect only if this condition is met
|
||||
// (NB: this function is needed even if !wxUSE_UNICODE_MSLU)
|
||||
WXDLLIMPEXP_BASE bool wxUsingUnicowsDll();
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// Wrongly implemented functions from unicows.dll
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#if !wxUSE_UNICODE_MSLU
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
|
||||
|
@ -26,6 +26,22 @@
|
||||
#endif
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// Check for use of MSLU
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_BASE
|
||||
|
||||
bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
|
||||
{
|
||||
#if wxUSE_UNICODE_MSLU
|
||||
return (wxGetOsVersion() == wxWIN95);
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // wxUSE_BASE
|
||||
|
||||
|
||||
#if wxUSE_UNICODE_MSLU
|
||||
|
||||
|
@ -111,22 +111,6 @@ static const wxChar eUSERNAME[] = wxT("UserName");
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
#if !wxUSE_UNICODE_MSLU
|
||||
|
||||
bool wxUsingUnicowsDll()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
bool wxUsingUnicowsDll()
|
||||
{
|
||||
return (wxGetOsVersion() == wxWIN95);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// get host name and related
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user