diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 14:01:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 14:01:57 +0000 |
| commit | 0fc967dfccd256b94f7e64bbed4101c650f1fab9 (patch) | |
| tree | 3861d80c527109351be90bdc6f6f8562a1352cd7 /desktop/source/migration/wizard.cxx | |
| parent | bd477204b5866e368b5a57f4d7f469c3c28e6652 (diff) | |
INTEGRATION: CWS fwkfinal4 (1.3.10); FILE MERGED
2005/03/22 17:07:27 lo 1.3.10.3: #i45398# #i45757# button position and no help on F1 in wizard
2005/03/21 13:33:43 lo 1.3.10.2: #i45398# fix access violation (mea culpa)
2005/03/18 16:30:03 lo 1.3.10.1: #i45398# remove help button from 1st start wizard
Diffstat (limited to 'desktop/source/migration/wizard.cxx')
| -rw-r--r-- | desktop/source/migration/wizard.cxx | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 1c8c90fe3b..ddeaf723e1 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wizard.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2005-03-11 10:50:09 $ + * last change: $Author: rt $ $Date: 2005-03-29 15:01:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,8 +150,10 @@ FirstStartWizard::FirstStartWizard(Window* pParent) m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT); m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL); m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH); - m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); - + // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); + m_pHelp->Hide(); + m_pHelp->Disable(); + // save button lables m_sNext = m_pNextPage->GetText(); m_sCancel = m_pCancel->GetText(); @@ -200,6 +202,19 @@ FirstStartWizard::FirstStartWizard(Window* pParent) } +// catch F1 and disable help +long FirstStartWizard::PreNotify( NotifyEvent& rNEvt ) +{ + if( rNEvt.GetType() == EVENT_KEYINPUT ) + { + const KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); + if( rKey.GetCode() == KEY_F1 && ! rKey.GetModifier() ) + return TRUE; + } + return RoadmapWizard::PreNotify(rNEvt); +} + + void FirstStartWizard::enterState(WizardState _nState) { RoadmapWizard::enterState(_nState); |