зеркало из https://github.com/mozilla/gecko-dev.git
QNX bustage fixes
This commit is contained in:
Родитель
268402d1b8
Коммит
c0c1a87242
|
@ -547,8 +547,10 @@ static void mozilla_modify( PtWidget_t *widget, PtArg_t const *argt ) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Pt_ARG_MOZ_ENCODING: {
|
case Pt_ARG_MOZ_ENCODING: {
|
||||||
nsCString mStr( (char*)argt->value );
|
moz->MyBrowser->mPrefs->SetUnicharPref(
|
||||||
moz->MyBrowser->mPrefs->SetUnicharPref( "intl.charset.default", mStr.get() );
|
"intl.charset.default",
|
||||||
|
NS_ConvertASCIItoUCS2((char*)argt->value).get()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -593,11 +595,8 @@ static void mozilla_modify( PtWidget_t *widget, PtArg_t const *argt ) {
|
||||||
|
|
||||||
case Pt_MOZ_COMMAND_FIND: {
|
case Pt_MOZ_COMMAND_FIND: {
|
||||||
PtWebCommand_t *wdata = ( PtWebCommand_t * ) argt->len;
|
PtWebCommand_t *wdata = ( PtWebCommand_t * ) argt->len;
|
||||||
nsCString searchString( wdata->FindInfo.szString );
|
|
||||||
nsCOMPtr<nsIWebBrowserFind> finder( do_GetInterface( moz->MyBrowser->WebBrowser ) );
|
nsCOMPtr<nsIWebBrowserFind> finder( do_GetInterface( moz->MyBrowser->WebBrowser ) );
|
||||||
|
finder->SetSearchString( NS_ConvertASCIItoUCS2(wdata->FindInfo.szString).get() );
|
||||||
finder->SetSearchString( searchString.get() );
|
|
||||||
|
|
||||||
finder->SetMatchCase( wdata->FindInfo.flags & FINDFLAG_MATCH_CASE );
|
finder->SetMatchCase( wdata->FindInfo.flags & FINDFLAG_MATCH_CASE );
|
||||||
finder->SetFindBackwards( wdata->FindInfo.flags & FINDFLAG_GO_BACKWARDS );
|
finder->SetFindBackwards( wdata->FindInfo.flags & FINDFLAG_GO_BACKWARDS );
|
||||||
finder->SetWrapFind( wdata->FindInfo.flags & FINDFLAG_START_AT_TOP );
|
finder->SetWrapFind( wdata->FindInfo.flags & FINDFLAG_START_AT_TOP );
|
||||||
|
@ -606,8 +605,6 @@ static void mozilla_modify( PtWidget_t *widget, PtArg_t const *argt ) {
|
||||||
PRBool didFind;
|
PRBool didFind;
|
||||||
finder->FindNext( &didFind );
|
finder->FindNext( &didFind );
|
||||||
|
|
||||||
Recycle( u );
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче