From 8ffebb5d83f41676f4eda27e925c4b26951ad59c Mon Sep 17 00:00:00 2001 From: "cmanske%netscape.com" Date: Tue, 25 Aug 1998 22:47:40 +0000 Subject: [PATCH] Composer FE bug fixes. Reverted background drawing change - fixed in XP code git-svn-id: svn://10.0.0.236/trunk@8476 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/winfe/cxdc.cpp | 4 +--- mozilla/cmd/winfe/edprops.cpp | 3 +++ mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc | 2 +- mozilla/cmd/winfe/edview2.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mozilla/cmd/winfe/cxdc.cpp b/mozilla/cmd/winfe/cxdc.cpp index 7d6688c84c5..a4bae062f3e 100644 --- a/mozilla/cmd/winfe/cxdc.cpp +++ b/mozilla/cmd/winfe/cxdc.cpp @@ -3669,9 +3669,7 @@ void CDCCX::DisplayText(MWContext *pContext, int iLocation, LO_TextStruct *pText wfe_GetSelectionColors(m_rgbBackgroundColor, &rgbColor, &textBackColor); } - //cmanske: Why would we EVER want to draw opaque EXCEPT for selected text? - // This messes up drawing text in tables when background color and/or image is set - if(pText->ele_attrmask & LO_ELE_SELECTED /*display_background_color*/) + if(display_background_color) { rgbOldBackgroundColor = ::SetBkColor(hdc, textBackColor); ::SetBkMode(hdc, OPAQUE); diff --git a/mozilla/cmd/winfe/edprops.cpp b/mozilla/cmd/winfe/edprops.cpp index d214e4aee72..5ddac26cf36 100644 --- a/mozilla/cmd/winfe/edprops.cpp +++ b/mozilla/cmd/winfe/edprops.cpp @@ -2681,6 +2681,9 @@ BOOL CTargetDlg::OnInitDialog() CDialog::OnInitDialog(); + // Enable OK only if we have some text already + GetDlgItem(IDOK)->EnableWindow(!m_csName.IsEmpty()); + return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE } diff --git a/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc b/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc index 3b8f93a0701..301613136a5 100644 --- a/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc +++ b/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc @@ -550,7 +550,7 @@ CAPTION "Save New Page" FONT 8, "MS Sans Serif" BEGIN ICON "IDI_ASTERISK",IDC_INFO_ICON,7,6,21,20 - LTEXT "You must save this page locally before continuing with the requested action.", + LTEXT "You must save this page before continuing with the requested action.", IDC_STATIC,45,8,148,29 DEFPUSHBUTTON "Save...",IDOK,44,40,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,105,40,50,14 diff --git a/mozilla/cmd/winfe/edview2.cpp b/mozilla/cmd/winfe/edview2.cpp index f193c26524e..f90361f003c 100644 --- a/mozilla/cmd/winfe/edview2.cpp +++ b/mozilla/cmd/winfe/edview2.cpp @@ -4422,7 +4422,7 @@ void CNetscapeEditView::BuildEditHistoryMenu(HMENU hMenu, int iStartItem) pMenuItem = PR_smprintf(" &%d %s", i+1, csMenuString); else if (i == 9) // Use "0" as accelerator for tenth file - pMenuItem = PR_smprintf("&%d %s", 10, csMenuString); + pMenuItem = PR_smprintf("%d&%d %s", 1, 0, csMenuString); else // This isn't used with our current maximum of 10 files, // but keep in case we increase MAX_EDIT_HISTORY_LOCATIONS