Commit 952d3486 authored by Mark Moriarty's avatar Mark Moriarty

Revert wxwidgets.hpp change -- problem appears to have been that gui/wxwidgets...

Revert wxwidgets.hpp change -- problem appears to have been that gui/wxwidgets had been getting built against non-Unicode lib.
parent cd0a6772
/***************************************************************************** /*****************************************************************************
* wxwidgets.hpp: Common headers for the wxwidges interface * wxwidgets.hpp: Common headers for the wxwidgets interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2005 the VideoLAN team * Copyright (C) 1999-2005 the VideoLAN team
* $Id$ * $Id$
...@@ -97,7 +97,7 @@ static inline char *wxFromLocale (const wxString& string) ...@@ -97,7 +97,7 @@ static inline char *wxFromLocale (const wxString& string)
{ {
#if defined( wxUSE_UNICODE ) #if defined( wxUSE_UNICODE )
# if defined( WIN32 ) # if defined( WIN32 )
return (char *) wxConvCurrent->cWX2MB(string); return FromWide ((const wchar_t *)string.c_str());
# define wxLocaleFree free # define wxLocaleFree free
# else # else
return FromLocale (string.mb_str()); return FromLocale (string.mb_str());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment