diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-04 17:40:13 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-28 17:48:37 +0200 |
| commit | e310c00709ed4fe0788aeff5142e3581d8b4d319 (patch) | |
| tree | b85827742e4a93a57150b5d8d254ea85a6265379 /vcl/osx/salframe.cxx | |
| parent | dea1b649765262b2e8beac88b0977d5dead98953 (diff) | |
Unify SalUserEvent handling
Merges the various SalUserEvent structs and their handling into
a single class. This includes a common SalFrame* hash map, as all
backends use such a map to verify alive SalFrames.
It also reverts the "FIXME: lousy workaround" for i#90083, which
was part of commit d6f7c94e5c27ba02ff5c3229760c9808cc9b5bea.
At least on my current OSX box application based window switching
"just works" "out of the box", even without the code.
Change-Id: I188b567e44fd79c162b2d9cabbd771d1f66c7dc4
Reviewed-on: https://gerrit.libreoffice.org/42845
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/osx/salframe.cxx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index e54073cdf4f1..dcdfe6d9c936 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -87,8 +87,7 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, SalFrameStyleFlags salFrameStyle initWindowAndView(); SalData* pSalData = GetSalData(); - pSalData->maFrames.push_front( this ); - pSalData->maFrameCheck.insert( this ); + pSalData->mpFirstInstance->insertFrame( this ); } AquaSalFrame::~AquaSalFrame() @@ -106,8 +105,7 @@ AquaSalFrame::~AquaSalFrame() [SalFrameView unsetMouseFrame: this]; SalData* pSalData = GetSalData(); - pSalData->maFrames.remove( this ); - pSalData->maFrameCheck.erase( this ); + pSalData->mpFirstInstance->eraseFrame( this ); pSalData->maPresentationFrames.remove( this ); SAL_WARN_IF( this == s_pCaptureFrame, "vcl", "capture frame destroyed" ); @@ -296,7 +294,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) bool AquaSalFrame::PostEvent(ImplSVEvent* pData) { - GetSalData()->mpFirstInstance->PostUserEvent( this, SalEvent::UserEvent, pData ); + GetSalData()->mpFirstInstance->PostEvent( this, pData, SalEvent::UserEvent ); return TRUE; } |