summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpframe.cxx4
-rw-r--r--vcl/inc/headless/svpframe.hxx1
-rw-r--r--vcl/inc/osx/salframe.h1
-rw-r--r--vcl/inc/salframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx1
-rw-r--r--vcl/inc/unx/salframe.h1
-rw-r--r--vcl/inc/win/salframe.h1
-rw-r--r--vcl/osx/salframe.cxx12
-rw-r--r--vcl/source/gdi/impanmvw.cxx2
-rw-r--r--vcl/source/window/window.cxx6
-rw-r--r--vcl/unx/generic/window/salframe.cxx5
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx5
-rw-r--r--vcl/win/source/window/salframe.cxx5
-rw-r--r--vcl/workben/outdevgrind.cxx2
15 files changed, 3 insertions, 47 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index eeed1fcf202f..f3f2ccef41f8 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -413,10 +413,6 @@ void SvpSalFrame::Flush()
{
}
-void SvpSalFrame::Sync()
-{
-}
-
void SvpSalFrame::SetInputContext( SalInputContext* )
{
}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index f64d22f7c303..dbe7d916742e 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -106,7 +106,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) override;
using SalFrame::Flush;
virtual void Flush() override;
- virtual void Sync() override;
virtual void SetInputContext( SalInputContext* pContext ) override;
virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 4e483f8defc1..1c0d8b7a56b7 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -132,7 +132,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) override;
virtual void Flush( void ) override;
virtual void Flush( const Rectangle& ) override;
- virtual void Sync() override;
virtual void SetInputContext( SalInputContext* pContext ) override;
virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 0b781ef3aa39..14fb2fa3095e 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -181,8 +181,6 @@ public:
// flush output buffer
virtual void Flush() = 0;
virtual void Flush( const Rectangle& );
- // flush output buffer, wait till outstanding operations are done
- virtual void Sync() = 0;
virtual void SetInputContext( SalInputContext* pContext ) = 0;
virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4f73ac8fc2d0..41cd6aafc5e0 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -410,7 +410,6 @@ public:
using SalFrame::Flush;
virtual void Flush() override;
// flush output buffer, wait till outstanding operations are done
- virtual void Sync() override;
virtual void SetInputContext( SalInputContext* pContext ) override;
virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index d595c441bd26..fc8f0d3563d4 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -234,7 +234,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) override;
using SalFrame::Flush;
virtual void Flush() override;
- virtual void Sync() override;
virtual void SetInputContext( SalInputContext* pContext ) override;
virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override;
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 27fa46e5c3fb..600946f4b878 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -113,7 +113,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) override;
using SalFrame::Flush;
virtual void Flush() override;
- virtual void Sync() override;
virtual void SetInputContext( SalInputContext* pContext ) override;
virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index c4f03195d72f..1ce314ee2b85 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -904,18 +904,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
}
}
-void AquaSalFrame::Sync()
-{
- if( mbGraphics && mpGraphics && mpNSView && mbShown )
- {
- // #i113170# may not be the main thread if called from UNO API
- SalData::ensureThreadAutoreleasePool();
-
- [mpNSView setNeedsDisplay: YES];
- [mpNSView display];
- }
-}
-
void AquaSalFrame::SetInputContext( SalInputContext* pContext )
{
if (!pContext)
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 2b28b3cc97ff..65c321685b54 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -301,7 +301,7 @@ void ImplAnimView::draw( sal_uLong nPos, VirtualDevice* pVDev )
pDev.disposeAndClear();
if( pRenderContext->GetOutDevType() == OUTDEV_WINDOW )
- static_cast<vcl::Window*>( pRenderContext.get() )->Sync();
+ static_cast<vcl::Window*>( pRenderContext.get() )->Flush();
}
}
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f44f1a2c03b1..97a29915da9d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3156,12 +3156,6 @@ void Window::Flush()
mpWindowImpl->mpFrame->Flush( aWinRect );
}
-void Window::Sync()
-{
-
- mpWindowImpl->mpFrame->Sync();
-}
-
void Window::SetUpdateMode( bool bUpdate )
{
mpWindowImpl->mbNoUpdate = !bUpdate;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 4be20a723b8b..0b55e286acb5 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2289,11 +2289,6 @@ void X11SalFrame::Flush()
XFlush( GetDisplay()->GetDisplay() );
}
-void X11SalFrame::Sync()
-{
- XSync( GetDisplay()->GetDisplay(), False );
-}
-
// Keyboard
void X11SalFrame::SetInputContext( SalInputContext* pContext )
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index 3de060bdc843..463c3c1ff486 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -78,7 +78,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
g_signal_connect( G_OBJECT(m_pSocket), "destroy", G_CALLBACK(signalDestroy), this );
// #i59255# necessary due to sync effects with java child windows
- pParent->Sync();
+ pParent->Flush();
}
}
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 95a33f0db29b..3e0749fd0d0d 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2642,11 +2642,6 @@ void GtkSalFrame::Flush()
#endif
}
-void GtkSalFrame::Sync()
-{
- gdk_display_sync( getGdkDisplay() );
-}
-
#ifndef GDK_Open
#define GDK_Open 0x1008ff6b
#endif
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 634d5fd1fe43..0203b05232b3 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2205,11 +2205,6 @@ void WinSalFrame::Flush()
GdiFlush();
}
-void WinSalFrame::Sync()
-{
- GdiFlush();
-}
-
static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index e41f7a2f3eab..6326a77c50ee 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -752,7 +752,7 @@ void grindFunc( OutputDevice& rTarget,
iter->second(&rTarget);
if( rTarget.GetOutDevType() == OUTDEV_WINDOW )
- static_cast< vcl::Window & >( rTarget ).Sync();
+ static_cast< vcl::Window & >( rTarget ).Flush();
fprintf( stdout,
"Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n",
generated by cgit (git 2.34.1) at 2025-01-16 01:02:13 +0000