From: Vadim Zeitlin Date: Thu, 16 Oct 2003 11:23:07 +0000 (+0000) Subject: compilation fix for Watcom (part of patch 813225) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/311ccb86e4e31c7c257d9efd3435fb2724101b10 compilation fix for Watcom (part of patch 813225) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/filefn.h b/include/wx/filefn.h index b0daaceef5..e2c028f542 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -112,7 +112,11 @@ enum wxSeekMode #endif #define wxAccess _access #define wxMkDir _mkdir +#ifdef __WATCOMC__ + #define wxRmDir rmdir +#else #define wxRmDir _rmdir +#endif #define wxStat _stat #endif diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index dba3591068..de616e06d1 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -1076,30 +1076,30 @@ public: NormalFont->GetStringSelection(), FixedFont->GetStringSelection(), FontSize->GetValue()); - TestWin->SetPage(_( -"\ -

\ -Normal face
(and underlined. Italic face. \ -Bold face. Bold italic face.
\ -font size -2
\ -font size -1
\ -font size +0
\ -font size +1
\ -font size +2
\ -font size +3
\ -font size +4
\ -

\ -

Fixed size face. bold italic \ -bold italic underlined \ -font size -2 \ -font size -1 \ -font size +0 \ -font size +1 \ -font size +2 \ -font size +3 \ -font size +4\ -

" - )); + + wxString content(_("font size")); + + content = _T("") + content + _T(" -2
") + _T("") + content + _T(" -1
") + _T("") + content + _T(" +0
") + _T("") + content + _T(" +1
") + _T("") + content + _T(" +2
") + _T("") + content + _T(" +3
") + _T("") + content + _T(" +4
") ; + + content = wxString( _T("

") ) + + _("Normal face
and underlined. ") + + _("Italic face. ") + + _("Bold face. ") + + _("Bold italic face.
") + + content + + wxString( _T(" ") ) + + _("Fixed size face. bold italic ") + + _("bold italic underlined ") + + content + + _T("

"); + + TestWin->SetPage( content ); } void OnUpdate(wxCommandEvent& WXUNUSED(event))