summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/dbaccess/AsyncronousLink.hxx4
-rw-r--r--include/svtools/asynclink.hxx3
-rw-r--r--include/svtools/editbrowsebox.hxx2
-rw-r--r--include/svtools/ruler.hxx2
-rw-r--r--include/svx/gridctrl.hxx4
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx2
-rw-r--r--include/vcl/evntpost.hxx4
-rw-r--r--include/vcl/floatwin.hxx2
-rw-r--r--include/vcl/menu.hxx3
-rw-r--r--include/vcl/svapp.hxx25
-rw-r--r--include/vcl/window.hxx6
11 files changed, 26 insertions, 31 deletions
diff --git a/include/dbaccess/AsyncronousLink.hxx b/include/dbaccess/AsyncronousLink.hxx
index 2a1cfc06a4f2..b0ba02d854be 100644
--- a/include/dbaccess/AsyncronousLink.hxx
+++ b/include/dbaccess/AsyncronousLink.hxx
@@ -23,6 +23,8 @@
#include <tools/link.hxx>
#include <osl/mutex.hxx>
+struct ImplSVEvent;
+
namespace dbaui
{
@@ -41,7 +43,7 @@ namespace dbaui
protected:
::osl::Mutex m_aEventSafety;
::osl::Mutex m_aDestructionSafety;
- sal_uLong m_nEventId;
+ ImplSVEvent * m_nEventId;
public:
/** constructs the object
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index 55a156e37014..e303bbe75e0a 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -26,13 +26,14 @@
#include <osl/mutex.hxx>
class Timer;
+struct ImplSVEvent;
namespace svtools {
class SVT_DLLPUBLIC AsynchronLink
{
Link _aLink;
- sal_uLong _nEventId;
+ ImplSVEvent * _nEventId;
Timer* _pTimer;
bool _bInCall;
bool* _pDeleted;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index b5157e9fd6be..ff8d73219d87 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -471,7 +471,7 @@ namespace svt
CellControllerRef aController,
aOldController;
- sal_uLong nStartEvent, nEndEvent, nCellModifiedEvent; // event ids
+ ImplSVEvent * nStartEvent, * nEndEvent, * nCellModifiedEvent; // event ids
Window* m_pFocusWhileRequest;
// In ActivateCell, we grab the focus asynchronously, but if between requesting activation
// and the asynchornous event the focus has changed, we won't grab it for ourself.
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index d162639627d0..b645c45b9261 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -623,7 +623,7 @@ private:
long mnBorderWidth;
long mnStartDragPos;
long mnDragPos;
- sal_uLong mnUpdateEvtId;
+ ImplSVEvent * mnUpdateEvtId;
ImplRulerData* mpSaveData;
ImplRulerData* mpData;
ImplRulerData* mpDragData;
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 8fb2dbb6183d..39a273b37aca 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -233,7 +233,7 @@ private:
m_xEmptyRow; // record set to insert
- sal_uInt32 m_nAsynAdjustEvent;
+ ImplSVEvent * m_nAsynAdjustEvent;
// if we modify the row for the new record, we automatically insert a "new new row".
// But if somebody else inserts a new record into the data source, we have to do the same.
@@ -272,7 +272,7 @@ private:
BrowserMode m_nMode;
sal_Int32 m_nCurrentPos; // Current position;
- sal_uInt32 m_nDeleteEvent; // EventId for asychronous deletion of rows
+ ImplSVEvent * m_nDeleteEvent; // EventId for asychronous deletion of rows
sal_uInt16 m_nOptions; // What is the able to do (Insert, Update, Delete)
// default readonly
sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 1550bc4c7771..0f2de215415f 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -167,7 +167,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxModifyListener;
- sal_uLong mnUpdateEvent;
+ ImplSVEvent * mnUpdateEvent;
};
rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController );
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 3b502a4a9be7..59898236c391 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -22,7 +22,7 @@
#include <tools/link.hxx>
#include <vcl/dllapi.h>
-
+struct ImplSVEvent;
namespace vcl
{
@@ -34,7 +34,7 @@ namespace vcl
class VCL_DLLPUBLIC EventPoster
{
- sal_uLong m_nId;
+ ImplSVEvent * m_nId;
Link m_aLink;
DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* );
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index e58873eb62a3..62d0086b6275 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -72,7 +72,7 @@ private:
Window* mpFirstPopupModeWin;
ImplData* mpImplData;
Rectangle maFloatRect;
- sal_uLong mnPostId;
+ ImplSVEvent * mnPostId;
sal_uLong mnPopupModeFlags;
sal_uInt16 mnTitle;
sal_uInt16 mnOldTitle;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 10ac7889e3b1..9f31b20421cf 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -30,6 +30,7 @@
#include <vcl/vclevent.hxx>
#include <com/sun/star/uno/Reference.hxx>
+struct ImplSVEvent;
struct MenuItemData;
class Point;
class Size;
@@ -128,7 +129,7 @@ private:
OUString aTitleText; // PopupMenu text
- sal_uLong nEventId;
+ ImplSVEvent * nEventId;
sal_uInt16 mnHighlightedItemPos; // for native menus: keeps track of the highlighted item
sal_uInt16 nMenuFlags;
sal_uInt16 nDefaultItem; // Id of default item
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index b7e00ca17c2e..5f24c761a964 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -60,6 +60,7 @@ class KeyEvent;
class MouseEvent;
class ZoomEvent;
class ScrollEvent;
+struct ImplSVEvent;
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/connection/XConnection.hpp>
@@ -846,7 +847,7 @@ public:
@see HandleKey
*/
- static sal_uLong PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent );
+ static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent );
/** Send mouse event
@@ -854,7 +855,7 @@ public:
@param pWin Pointer to window to which the event is sent
@param pKeyEvent Mouse event to send
*/
- static sal_uLong PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent );
+ static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent );
#if !HAVE_FEATURE_DESKTOP
/** Send zoom event
@@ -863,7 +864,7 @@ public:
@param pWin Pointer to window to which the event is sent
@param pZoomEvent Zoom event to send
*/
- static sal_uLong PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent );
+ static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent );
/* Send scroll event
@@ -871,7 +872,7 @@ public:
@param pWin Pointer to window to which the event is sent
@param pScrollEvent Scroll event to send
*/
- static sal_uLong PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent );
+ static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent );
#endif
/** Remove mouse and keypress events from a window... any also zoom and scroll events
@@ -892,23 +893,13 @@ public:
@return the event ID used to post the event.
*/
- static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL );
-
- /** Post a user event to the default window.
-
- @param rEventID Reference to event ID to be posted
- @param rLink Link to event callback function
- @param pCaller Pointer to data sent to teh event by the caller. Optional.
-
- @return true if there is a default window and the event could be posted to it successfully.
- */
- static bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
+ static ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL );
/** Remove user event based on event ID
- @param nUserEvent Numeric user event to remove
+ @param nUserEvent User event to remove
*/
- static void RemoveUserEvent( sal_uLong nUserEvent );
+ static void RemoveUserEvent( ImplSVEvent * nUserEvent );
/** Insert an idle handler into the application.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 64d47324c60b..b7cb9b3814bf 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -41,6 +41,7 @@
class VirtualDevice;
struct ImplDelData;
+struct ImplSVEvent;
struct ImplWinData;
struct ImplFrameData;
struct ImplCalcToTopData;
@@ -704,9 +705,8 @@ public:
/*virtual*/ void AddChildEventListener( const Link& rEventListener );
/*virtual*/ void RemoveChildEventListener( const Link& rEventListener );
- sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL );
- bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
- void RemoveUserEvent( sal_uLong nUserEvent );
+ ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL );
+ void RemoveUserEvent( ImplSVEvent * nUserEvent );
void IncrementLockCount();
void DecrementLockCount();
generated by cgit (git 2.34.1) at 2025-02-09 17:30:22 +0000