fix up patch

f41
Caolán McNamara 12 years ago
parent 011db7c89b
commit 62ff7cb218

@ -21,15 +21,16 @@ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 373143b..d2336ec 100644 index 373143b..d2336ec 100644
--- a/vcl/source/control/button.cxx --- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx
@@ -157,12 +157,15 @@ XubString Button::GetStandardText( StandardButtonType eButton ) @@ -152,13 +152,15 @@ XubString Button::GetStandardText( StandardButtonType eButton )
sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId; sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
aText = ResId(nResId, *pResMgr).toString(); ResId aResId( nResId, *pResMgr );
aText = String( aResId );
-
- // Windows (apparently) has some magic auto-accelerator evil around - // Windows (apparently) has some magic auto-accelerator evil around
- // ok / cancel so add this only for Unix - // ok / cancel so add this only for Unix
-#ifdef UNX -#ifdef UNX
- if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL ) - if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL )
- aText.Insert( rtl::OUString("~"), 0 ); - aText.Insert( String::CreateFromAscii("~"), 0 );
+ if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL) + if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
+ { + {
+#ifndef WNT +#ifndef WNT
@ -42,6 +43,3 @@ index 373143b..d2336ec 100644
} }
else else
{ {
--
1.7.11.7

Loading…
Cancel
Save