X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwxwidgets%2Fwxwidgets.h;h=e97463f85da3fcef4d111cd37356f031fd550094;hb=0a7e683444a80d0a394e535d041d601142ee8e2b;hp=0c0ce3ae281f1fa60fbf0984bde5064cdfffcfbc;hpb=3605f503ff076a9e3315aa27fe28a1f507424599;p=vlc diff --git a/modules/gui/wxwidgets/wxwidgets.h b/modules/gui/wxwidgets/wxwidgets.h index 0c0ce3ae28..e97463f85d 100644 --- a/modules/gui/wxwidgets/wxwidgets.h +++ b/modules/gui/wxwidgets/wxwidgets.h @@ -80,6 +80,14 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 ); * strings (wchar_t) */ #define wxL2U(ansi) wxU(ansi) +#if wxUSE_UNICODE +# define wxFromLocale(wxstring) FromUTF32(wxstring.wc_str()) +# define wxLocaleFree(string) free(string) +#else +# define wxFromLocale(wxstring) FromLocale(wxstring.mb_str()) +# define wxLocaleFree(string) LocaleFree(string) +#endif + #define WRAPCOUNT 80 #define OPEN_NORMAL 0 @@ -589,6 +597,7 @@ enum FILE_ACCESS_OUT, HTTP_ACCESS_OUT, MMSH_ACCESS_OUT, + RTP_ACCESS_OUT, UDP_ACCESS_OUT, ACCESS_OUT_NUM }; @@ -869,6 +878,7 @@ public: void AppendItem( wxCommandEvent& ); bool b_need_update; + int i_items_to_append; private: void RemoveItem( int );