summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/event.cxx2
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/menufloatingwindow.cxx2
-rw-r--r--vcl/source/window/openglwin.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx4
-rw-r--r--vcl/source/window/scrwnd.cxx2
-rw-r--r--vcl/source/window/seleng.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx4
-rw-r--r--vcl/source/window/window2.cxx8
-rw-r--r--vcl/source/window/winproc.cxx40
10 files changed, 34 insertions, 34 deletions
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 1a14dd19b26e..3e729fd738f4 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -329,7 +329,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
if( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
- if ( pCEvt->GetCommand() != COMMAND_CONTEXTMENU )
+ if ( pCEvt->GetCommand() != CommandEventId::ContextMenu )
// non context menu events are not to be notified up the chain
// so we return immediately
return;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ee0a0248de1b..c8bffb54751c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1831,7 +1831,7 @@ bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
- if ( rCEvt.GetCommand() == COMMAND_WHEEL )
+ if ( rCEvt.GetCommand() == CommandEventId::Wheel )
{
const CommandWheelData* pData = rCEvt.GetWheelData();
if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index d188bca2b5a9..bf7c255769b1 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1183,7 +1183,7 @@ void MenuFloatingWindow::DataChanged( const DataChangedEvent& rDCEvt )
void MenuFloatingWindow::Command( const CommandEvent& rCEvt )
{
- if ( rCEvt.GetCommand() == COMMAND_WHEEL )
+ if ( rCEvt.GetCommand() == CommandEventId::Wheel )
{
const CommandWheelData* pData = rCEvt.GetWheelData();
if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 6111cbca0a1a..30094e439b5d 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -91,7 +91,7 @@ void OpenGLWindow::Command( const CommandEvent& rCEvt )
if(!mpRenderer)
return;
- if(rCEvt.GetCommand() == COMMAND_WHEEL)
+ if(rCEvt.GetCommand() == CommandEventId::Wheel)
{
const CommandWheelData* pData = rCEvt.GetWheelData();
if(pData->GetMode() == CommandWheelMode::SCROLL)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 97e72cefdd6e..ecc8d7afd487 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -197,7 +197,7 @@ void PrintDialog::PrintPreviewWindow::Paint(vcl::RenderContext& rRenderContext,
void PrintDialog::PrintPreviewWindow::Command( const CommandEvent& rEvt )
{
- if( rEvt.GetCommand() == COMMAND_WHEEL )
+ if( rEvt.GetCommand() == CommandEventId::Wheel )
{
const CommandWheelData* pWheelData = rEvt.GetWheelData();
PrintDialog* pDlg = dynamic_cast<PrintDialog*>(GetParentDialog());
@@ -1858,7 +1858,7 @@ IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit*, i_pBox )
void PrintDialog::Command( const CommandEvent& rEvt )
{
- if( rEvt.GetCommand() == COMMAND_WHEEL )
+ if( rEvt.GetCommand() == CommandEventId::Wheel )
{
const CommandWheelData* pWheelData = rEvt.GetWheelData();
if( pWheelData->GetDelta() > 0 )
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 1e7a44af1000..6fe7049159e0 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -367,7 +367,7 @@ IMPL_LINK_NOARG_TYPED(ImplWheelWindow, ImplScrollHdl, Timer *, void)
const Point aMousePos( pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() ) );
Point aCmdMousePos( pWindow->ImplFrameToOutput( aMousePos ) );
CommandScrollData aScrollData( mnActDeltaX, mnActDeltaY );
- CommandEvent aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, true, &aScrollData );
+ CommandEvent aCEvt( aCmdMousePos, CommandEventId::AutoScroll, true, &aScrollData );
NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt );
if ( !ImplCallPreNotify( aNCmdEvt ) )
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 5ed8c960715e..7999818b509c 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -345,7 +345,7 @@ void SelectionEngine::Command( const CommandEvent& rCEvt )
return;
aWTimer.Stop();
nFlags |= SelectionEngineFlags::CMDEVT;
- if ( rCEvt.GetCommand() == COMMAND_STARTDRAG )
+ if ( rCEvt.GetCommand() == CommandEventId::StartDrag )
{
if ( nFlags & SelectionEngineFlags::DRG_ENAB )
{
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 1b825b8bfe75..ce89b2747573 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4366,7 +4366,7 @@ void ToolBox::Command( const CommandEvent& rCEvt )
maCommandHandler.Call( &rCEvt );
// depict StartDrag on MouseButton/Left/Alt
- if ( (rCEvt.GetCommand() == COMMAND_STARTDRAG) && rCEvt.IsMouseEvent() &&
+ if ( (rCEvt.GetCommand() == CommandEventId::StartDrag) && rCEvt.IsMouseEvent() &&
mbCustomize && !mbDragging && !mbDrag && !mbSelection &&
(mnCurPos == TOOLBOX_ITEM_NOTFOUND) )
{
@@ -4404,7 +4404,7 @@ void ToolBox::Command( const CommandEvent& rCEvt )
}
}
}
- else if ( rCEvt.GetCommand() == COMMAND_WHEEL )
+ else if ( rCEvt.GetCommand() == CommandEventId::Wheel )
{
if ( (mnCurLine > 1) || (mnCurLine+mnVisLines-1 < mnCurLines) )
{
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 9df9085b8ca1..fd6cdf926d07 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -759,7 +759,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
{
switch( rCmd.GetCommand() )
{
- case COMMAND_STARTAUTOSCROLL:
+ case CommandEventId::StartAutoScroll:
{
sal_uInt16 nFlags = 0;
if ( pHScrl )
@@ -783,7 +783,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
}
break;
- case COMMAND_WHEEL:
+ case CommandEventId::Wheel:
{
const CommandWheelData* pData = rCmd.GetWheelData();
@@ -888,7 +888,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
}
break;
- case COMMAND_AUTOSCROLL:
+ case CommandEventId::AutoScroll:
{
const CommandScrollData* pData = rCmd.GetAutoScrollData();
if ( pData && (pData->GetDeltaX() || pData->GetDeltaY()) )
@@ -908,7 +908,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
return bRet;
}
-// Note that when called for COMMAND_WHEEL above, despite its name,
+// Note that when called for CommandEventId::Wheel above, despite its name,
// pVScrl isn't necessarily the vertical scroll bar. Depending on
// whether the scroll is horizontal or vertical, it is either the
// horizontal or vertical scroll bar. nY is correspondingly either
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 3ab6541c4edb..c2a7dc0c2d1c 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -196,7 +196,7 @@ static void ImplSetMousePointer( vcl::Window* pChild )
pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() );
}
-static bool ImplCallCommand( vcl::Window* pChild, sal_uInt16 nEvt, void* pData = NULL,
+static bool ImplCallCommand( vcl::Window* pChild, CommandEventId nEvt, void* pData = NULL,
bool bMouse = false, Point* pPos = NULL )
{
Point aPos;
@@ -255,7 +255,7 @@ static sal_IntPtr ContextMenuEventLink( void* pCEvent, void* )
if( ! pEv->aDelData.IsDead() )
{
pEv->pWindow->ImplRemoveDel( &pEv->aDelData );
- ImplCallCommand( pEv->pWindow, COMMAND_CONTEXTMENU, NULL, true, &pEv->aChildPos );
+ ImplCallCommand( pEv->pWindow, CommandEventId::ContextMenu, NULL, true, &pEv->aChildPos );
}
delete pEv;
@@ -787,9 +787,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
{
sal_uInt16 nMiddleAction = pChild->GetSettings().GetMouseSettings().GetMiddleButtonAction();
if ( nMiddleAction == MOUSE_MIDDLE_AUTOSCROLL )
- bRet = !ImplCallCommand( pChild, COMMAND_STARTAUTOSCROLL, NULL, true, &aChildPos );
+ bRet = !ImplCallCommand( pChild, CommandEventId::StartAutoScroll, NULL, true, &aChildPos );
else if ( nMiddleAction == MOUSE_MIDDLE_PASTESELECTION )
- bRet = !ImplCallCommand( pChild, COMMAND_PASTESELECTION, NULL, true, &aChildPos );
+ bRet = !ImplCallCommand( pChild, CommandEventId::PasteSelection, NULL, true, &aChildPos );
}
else
{
@@ -818,7 +818,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
Application::PostUserEvent( Link<>( pEv, ContextMenuEventLink ) );
}
else
- bRet = ! ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, true, &aChildPos );
+ bRet = ! ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL, true, &aChildPos );
}
}
}
@@ -1063,7 +1063,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
// ContextMenu
if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) )
- nRet = !ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, false );
+ nRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL, false );
else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) ||
// #101999# no active help when focus in toolbox, simulate BallonHelp instead
( (nCode == KEY_F1) && aKeyCode.IsShift() && bToolboxFocus ) )
@@ -1192,7 +1192,7 @@ static bool ImplHandleExtTextInput( vcl::Window* pWindow,
pWinData->mpExtOldAttrAry = NULL;
}
pSVData->maWinData.mpExtTextInputWin = pChild;
- ImplCallCommand( pChild, COMMAND_STARTEXTTEXTINPUT );
+ ImplCallCommand( pChild, CommandEventId::StartExtTextInput );
}
// be aware of being recursively called in StartExtTextInput
@@ -1246,7 +1246,7 @@ static bool ImplHandleExtTextInput( vcl::Window* pWindow,
pWinData->mpExtOldAttrAry = new sal_uInt16[rText.getLength()];
memcpy( pWinData->mpExtOldAttrAry, pTextAttr, rText.getLength()*sizeof( sal_uInt16 ) );
}
- return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData );
+ return !ImplCallCommand( pChild, CommandEventId::ExtTextInput, &aData );
}
static bool ImplHandleEndExtTextInput( vcl::Window* /* pWindow */ )
@@ -1270,7 +1270,7 @@ static bool ImplHandleEndExtTextInput( vcl::Window* /* pWindow */ )
delete [] pWinData->mpExtOldAttrAry;
pWinData->mpExtOldAttrAry = NULL;
}
- nRet = !ImplCallCommand( pChild, COMMAND_ENDEXTTEXTINPUT );
+ nRet = !ImplCallCommand( pChild, CommandEventId::EndExtTextInput );
}
return nRet;
@@ -1295,7 +1295,7 @@ static void ImplHandleExtTextInputPos( vcl::Window* pWindow,
if ( pChild )
{
const OutputDevice *pChildOutDev = pChild->GetOutDev();
- ImplCallCommand( pChild, COMMAND_CURSORPOS );
+ ImplCallCommand( pChild, CommandEventId::CursorPos );
const Rectangle* pRect = pChild->GetCursorRect();
if ( pRect )
rRect = pChildOutDev->ImplLogicToDevicePixel( *pRect );
@@ -1326,14 +1326,14 @@ static bool ImplHandleInputContextChange( vcl::Window* pWindow, LanguageType eNe
{
vcl::Window* pChild = ImplGetKeyInputWindow( pWindow );
CommandInputContextData aData( eNewLang );
- return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData );
+ return !ImplCallCommand( pChild, CommandEventId::InputContextChange, &aData );
}
static bool ImplCallWheelCommand( vcl::Window* pWindow, const Point& rPos,
const CommandWheelData* pWheelData )
{
Point aCmdMousePos = pWindow->ImplFrameToOutput( rPos );
- CommandEvent aCEvt( aCmdMousePos, COMMAND_WHEEL, true, pWheelData );
+ CommandEvent aCEvt( aCmdMousePos, CommandEventId::Wheel, true, pWheelData );
NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt );
ImplDelData aDelData( pWindow );
bool bPreNotify = ImplCallPreNotify( aNCmdEvt );
@@ -1580,7 +1580,7 @@ public:
}
virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE
{
- return ImplCallCommand(pWindow, COMMAND_SWIPE, &m_aSwipeData);
+ return ImplCallCommand(pWindow, CommandEventId::Swipe, &m_aSwipeData);
}
};
@@ -1602,7 +1602,7 @@ public:
}
virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE
{
- return ImplCallCommand(pWindow, COMMAND_LONGPRESS, &m_aLongPressData);
+ return ImplCallCommand(pWindow, CommandEventId::LongPress, &m_aLongPressData);
}
};
@@ -2180,7 +2180,7 @@ static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent* pEvent )
if( pEvent->mnModKeyCode != 0 )
{
CommandModKeyData data( pEvent->mnModKeyCode );
- ImplCallCommand( pChild, COMMAND_MODKEYCHANGE, &data );
+ ImplCallCommand( pChild, CommandEventId::ModKeyChange, &data );
}
}
@@ -2191,7 +2191,7 @@ static void ImplHandleInputLanguageChange( vcl::Window* pWindow )
if ( !pChild )
return;
- ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE );
+ ImplCallCommand( pChild, CommandEventId::InputLanguageChange );
}
static void ImplHandleSalSettings( sal_uInt16 nEvent )
@@ -2268,7 +2268,7 @@ static bool ImplHandleShowDialog( vcl::Window* pWindow, ShowDialogId nDialogId )
pWindow = pWrkWin;
}
CommandDialogData aCmdData( nDialogId );
- return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData );
+ return ImplCallCommand( pWindow, CommandEventId::ShowDialog, &aCmdData );
}
static void ImplHandleSurroundingTextRequest( vcl::Window *pWindow,
@@ -2323,7 +2323,7 @@ static void ImplHandleSurroundingTextSelectionChange( vcl::Window *pWindow,
if( pChild )
{
CommandSelectionChangeData data( nStart, nEnd );
- ImplCallCommand( pChild, COMMAND_SELECTIONCHANGE, &data );
+ ImplCallCommand( pChild, CommandEventId::SelectionChange, &data );
}
}
@@ -2331,7 +2331,7 @@ static void ImplHandleStartReconversion( vcl::Window *pWindow )
{
vcl::Window* pChild = ImplGetKeyInputWindow( pWindow );
if( pChild )
- ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION );
+ ImplCallCommand( pChild, CommandEventId::PrepareReconversion );
}
static void ImplHandleSalQueryCharPosition( vcl::Window *pWindow,
@@ -2358,7 +2358,7 @@ static void ImplHandleSalQueryCharPosition( vcl::Window *pWindow,
if( pChild )
{
- ImplCallCommand( pChild, COMMAND_QUERYCHARPOSITION );
+ ImplCallCommand( pChild, CommandEventId::QueryCharPosition );
ImplWinData* pWinData = pChild->ImplGetWinData();
if ( pWinData->mpCompositionCharRects && pEvt->mnCharPos < static_cast<sal_uLong>( pWinData->mnCompositionCharRects ) )
generated by cgit (git 2.34.1) at 2025-05-10 04:19:11 +0000