diff options
Diffstat (limited to 'vcl/source/window')
-rw-r--r-- | vcl/source/window/dialog.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/floatwin.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/layout.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/split.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/syswin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 12 |
8 files changed, 24 insertions, 24 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1e08a5a1051a..88439c970366 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -594,10 +594,10 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) // ----------------------------------------------------------------------- -long Dialog::Notify( NotifyEvent& rNEvt ) +bool Dialog::Notify( NotifyEvent& rNEvt ) { // Zuerst Basisklasse rufen wegen TabSteuerung - long nRet = SystemWindow::Notify( rNEvt ); + bool nRet = SystemWindow::Notify( rNEvt ); if ( !nRet ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -614,7 +614,7 @@ long Dialog::Notify( NotifyEvent& rNEvt ) // post this Close asynchronous so we can leave our key handler before // we get destroyed PostUserEvent( LINK( this, Dialog, ImplAsyncCloseHdl ), this ); - return sal_True; + return true; } } else if ( rNEvt.GetType() == EVENT_GETFOCUS ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 273f6344cdfa..12379f060649 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -596,7 +596,7 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt ) // ----------------------------------------------------------------------- -long DockingWindow::Notify( NotifyEvent& rNEvt ) +bool DockingWindow::Notify( NotifyEvent& rNEvt ) { if( GetDockingManager()->IsDockable( this ) ) // new docking interface return Window::Notify( rNEvt ); @@ -611,7 +611,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt ) if ( pMEvt->IsMod1() && (pMEvt->GetClicks() == 2) ) { SetFloatingMode( !IsFloatingMode() ); - return sal_True; + return true; } else if ( pMEvt->GetClicks() == 1 ) { @@ -629,7 +629,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt ) } ImplStartDocking( aPos ); } - return sal_True; + return true; } } } @@ -640,7 +640,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt ) rKey.IsShift() && rKey.IsMod1() ) { SetFloatingMode( !IsFloatingMode() ); - return sal_True; + return true; } } } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 10f1e974b08b..6ff72f93f364 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -552,10 +552,10 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) // ----------------------------------------------------------------------- -long FloatingWindow::Notify( NotifyEvent& rNEvt ) +bool FloatingWindow::Notify( NotifyEvent& rNEvt ) { // Zuerst Basisklasse rufen wegen TabSteuerung - long nRet = SystemWindow::Notify( rNEvt ); + bool nRet = SystemWindow::Notify( rNEvt ); if ( !nRet ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -567,7 +567,7 @@ long FloatingWindow::Notify( NotifyEvent& rNEvt ) if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) ) { Close(); - return sal_True; + return true; } } } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 73a1aaef4878..e3303ded6f53 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1773,9 +1773,9 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue) return bRet; } -long VclScrolledWindow::Notify(NotifyEvent& rNEvt) +bool VclScrolledWindow::Notify(NotifyEvent& rNEvt) { - long nDone = 0; + bool nDone = false; if ( rNEvt.GetType() == EVENT_COMMAND ) { const CommandEvent& rCEvt = *rNEvt.GetCommandEvent(); @@ -1789,7 +1789,7 @@ long VclScrolledWindow::Notify(NotifyEvent& rNEvt) } } - return nDone ? nDone : VclBin::Notify( rNEvt ); + return nDone || VclBin::Notify( rNEvt ); } const Window *VclEventBox::get_child() const diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 13cc48663aa0..f21e3b3083ed 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -733,7 +733,7 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -long Splitter::Notify( NotifyEvent& rNEvt ) +bool Splitter::Notify( NotifyEvent& rNEvt ) { return Window::Notify( rNEvt ); } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index d37abdd4c16b..8aa2c8b5c120 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -89,7 +89,7 @@ SystemWindow::~SystemWindow() // ----------------------------------------------------------------------- -long SystemWindow::Notify( NotifyEvent& rNEvt ) +bool SystemWindow::Notify( NotifyEvent& rNEvt ) { // capture KeyEvents for menu handling if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -102,7 +102,7 @@ long SystemWindow::Notify( NotifyEvent& rNEvt ) pMBar = ((SystemWindow*)pWin)->GetMenuBar(); } if ( pMBar && pMBar->ImplHandleKeyEvent( *rNEvt.GetKeyEvent(), sal_False ) ) - return sal_True; + return true; } return Window::Notify( rNEvt ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 1b4a2beffead..514d2efbbf0a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4360,7 +4360,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) // ----------------------------------------------------------------------- -long ToolBox::Notify( NotifyEvent& rNEvt ) +bool ToolBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -4382,7 +4382,7 @@ long ToolBox::Notify( NotifyEvent& rNEvt ) if( bNoTabCycling && ! (GetStyle() & WB_FORCETABCYCLE) ) return DockingWindow::Notify( rNEvt ); else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? sal_True : sal_False , bNoTabCycling ) ) - return sal_False; + return false; else return DockingWindow::Notify( rNEvt ); } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1bd234bf437e..4e91535945d8 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -5084,9 +5084,9 @@ long Window::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long Window::Notify( NotifyEvent& rNEvt ) +bool Window::Notify( NotifyEvent& rNEvt ) { - long nRet = sal_False; + bool nRet = false; // check for docking window // but do nothing if window is docked and locked @@ -5103,13 +5103,13 @@ long Window::Notify( NotifyEvent& rNEvt ) { // ctrl double click toggles floating mode pWrapper->SetFloatingMode( !pWrapper->IsFloatingMode() ); - return sal_True; + return true; } else if ( pMEvt->GetClicks() == 1 && bHit) { // allow start docking during mouse move pWrapper->ImplEnableStartDocking(); - return sal_True; + return true; } } } @@ -5133,7 +5133,7 @@ long Window::Notify( NotifyEvent& rNEvt ) } pWrapper->ImplStartDocking( aPos ); } - return sal_True; + return true; } } else if( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -5151,7 +5151,7 @@ long Window::Notify( NotifyEvent& rNEvt ) */ if( pWrapper->IsFloatingMode() ) ToTop( TOTOP_GRABFOCUSONLY ); - return sal_True; + return true; } } } |