summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-09 14:27:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-09 18:57:00 +0000
commit91b914882948c6acbb2dd6442083b8c6ccd9cf17 (patch)
treef0fd12aff18c9918b0fcd6adce52caf4ba9091a7 /vcl/inc
parentd6398719abecfca60db37637490e602222992dc2 (diff)
Change tools::Time::GetSystemTicks to sal_uInt64
...as follow-up clean-up after 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 "Change 'blink times' to be of type sal_uInt64 and thus consistent with Timer::Get/SetTimeout since 9c7016b5b530ca212b1275f44f9e2fc0527109ee 'Scheduler: Changed uLong to uInt32/uInt64.'" Transitively meant to change quite a number of further time-related places from sal_uLong/sal_uIntPtr to consistently use sal_uInt64. Change-Id: I38eb493943906356138bf58eb098d2f54a3dee34 Reviewed-on: https://gerrit.libreoffice.org/15214 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/osx/salframe.h2
-rw-r--r--vcl/inc/salwtype.hxx10
-rw-r--r--vcl/inc/svdata.hxx4
-rw-r--r--vcl/inc/window.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 20c89c8ea93d..4db73fb84c56 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -73,7 +73,7 @@ public:
sal_uLong mnStyle;
unsigned int mnStyleMask; // our style mask from NSWindow creation
- sal_uLong mnLastEventTime;
+ sal_uInt64 mnLastEventTime;
unsigned int mnLastModifierFlags;
AquaSalMenu* mpMenu;
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 67ad505b2fd7..c20c45442b3a 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -87,7 +87,7 @@ class FontSelectPattern;
// MAC: Ctrl+Button is MOUSE_RIGHT
struct SalMouseEvent
{
- sal_uLong mnTime; // Time in ms, when event is created
+ sal_uInt64 mnTime; // Time in ms, when event is created
long mnX; // X-Position (Pixel, TopLeft-Output)
long mnY; // Y-Position (Pixel, TopLeft-Output)
sal_uInt16 mnButton; // 0-MouseMove/MouseLeave, MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE
@@ -97,7 +97,7 @@ struct SalMouseEvent
// KEYINPUT and KEYUP
struct SalKeyEvent
{
- sal_uLong mnTime; // Time in ms, when event is created
+ sal_uInt64 mnTime; // Time in ms, when event is created
sal_uInt16 mnCode; // SV-KeyCode (KEY_xxx | KEY_SHIFT | KEY_MOD1 | KEY_MOD2)
sal_uInt16 mnCharCode; // SV-CharCode
sal_uInt16 mnRepeat; // Repeat-Count (KeyInputs-1)
@@ -117,7 +117,7 @@ struct SalMenuEvent
// KEYMODCHANGE
struct SalKeyModEvent
{
- sal_uLong mnTime; // Time in ms, when event is created
+ sal_uInt64 mnTime; // Time in ms, when event is created
sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2)
sal_uInt16 mnModKeyCode; // extended Modifier (MODKEY_LEFT,MODKEY_RIGHT,MODKEY_PRESS,MODKEY_RELEASE)
};
@@ -145,7 +145,7 @@ struct SalPaintEvent
#define SAL_WHEELMOUSE_EVENT_PAGESCROLL ((sal_uLong)0xFFFFFFFF)
struct SalWheelMouseEvent
{
- sal_uLong mnTime; // Time in ms, when event is created
+ sal_uInt64 mnTime; // Time in ms, when event is created
long mnX; // X-Position (Pixel, TopLeft-Output)
long mnY; // Y-Position (Pixel, TopLeft-Output)
long mnDelta; // Number of rotations
@@ -170,7 +170,7 @@ struct SalMouseActivateEvent
// EXTTEXTINPUT
struct SalExtTextInputEvent
{
- sal_uLong mnTime; // Time in ms, when event is created
+ sal_uInt64 mnTime; // Time in ms, when event is created
OUString maText; // Text
const sal_uInt16* mpTextAttr; // Text-Attribute
sal_Int32 mnCursorPos; // Cursor-Position
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 3b04e76f6d9c..4847e19e049e 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -126,7 +126,7 @@ struct ImplSVAppData
ImplHotKey* mpFirstHotKey; // HotKey-Verwaltung
ImplEventHook* mpFirstEventHook; // Event-Hooks
VclEventListeners2* mpPostYieldListeners; // post yield listeners
- sal_uLong mnLastInputTime; // GetLastInputTime()
+ sal_uInt64 mnLastInputTime; // GetLastInputTime()
sal_uInt16 mnDispatchLevel; // DispatchLevel
sal_uInt16 mnModalMode; // ModalMode Count
sal_uInt16 mnModalDialog; // ModalDialog Count
@@ -240,7 +240,7 @@ struct ImplSVHelpData
bool mbAutoHelpId : 1; // generate HelpIds
bool mbRequestingHelp : 1; // In Window::RequestHelp
HelpTextWindow* mpHelpWin; // HelpWindow
- sal_uLong mnLastHelpHideTime; // ticks of last show
+ sal_uInt64 mnLastHelpHideTime; // ticks of last show
};
// "NWF" means "Native Widget Framework" and was the term used for the
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 31c5dff7f4ea..75b8f5af3f61 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -157,7 +157,7 @@ struct ImplFrameData
long mnLastMouseWinX; //< last x mouse position, rel. to pMouseMoveWin
long mnLastMouseWinY; //< last y mouse position, rel. to pMouseMoveWin
sal_uInt16 mnModalMode; //< frame based modal count (app based makes no sense anymore)
- sal_uIntPtr mnMouseDownTime; //< mouse button down time for double click
+ sal_uInt64 mnMouseDownTime; //< mouse button down time for double click
sal_uInt16 mnClickCount; //< mouse click count
sal_uInt16 mnFirstMouseCode; //< mouse code by mousebuttondown
sal_uInt16 mnMouseCode; //< mouse code
@@ -382,7 +382,7 @@ public:
// helper methods
bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool bMouseLeave,
- long nX, long nY, sal_uIntPtr nMsgTime,
+ long nX, long nY, sal_uInt64 nMsgTime,
sal_uInt16 nCode, MouseEventModifiers nMode );
void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight );