summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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/qt5/QtFrame.hxx1
-rw-r--r--vcl/inc/salframe.hxx1
-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.cxx4
-rw-r--r--vcl/qt5/QtFrame.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx3
-rw-r--r--vcl/unx/generic/window/salframe.cxx5
-rw-r--r--vcl/unx/gtk3/gtkframe.cxx4
-rw-r--r--vcl/win/window/salframe.cxx5
14 files changed, 0 insertions, 34 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 62b43dfd0824..9ab3864aa7cd 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -200,10 +200,6 @@ void SvpSalFrame::SetMenu( SalMenu* )
{
}
-void SvpSalFrame::DrawMenuBar()
-{
-}
-
void SvpSalFrame::SetExtendedFrameStyle( SalExtStyle )
{
}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index f2fce5c420b4..bb15711aef53 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -80,7 +80,6 @@ public:
virtual void SetTitle( const OUString& rTitle ) override;
virtual void SetIcon( sal_uInt16 nIcon ) override;
virtual void SetMenu( SalMenu* pMenu ) override;
- virtual void DrawMenuBar() override;
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
virtual void Show( bool bVisible, bool bNoActivate = false ) override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 953a17adbcc9..71b8eb45b772 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -116,7 +116,6 @@ public:
virtual void SetIcon( sal_uInt16 nIcon ) override;
virtual void SetRepresentedURL( const OUString& ) override;
virtual void SetMenu( SalMenu* pSalMenu ) override;
- virtual void DrawMenuBar() override;
virtual void Show( bool bVisible, bool bNoActivate = false ) override;
virtual void SetMinClientSize( tools::Long nWidth, tools::Long nHeight )
override;
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx
index dcdca17844ae..562c7d3ba89a 100644
--- a/vcl/inc/qt5/QtFrame.hxx
+++ b/vcl/inc/qt5/QtFrame.hxx
@@ -160,7 +160,6 @@ public:
virtual void SetTitle(const OUString& rTitle) override;
virtual void SetIcon(sal_uInt16 nIcon) override;
virtual void SetMenu(SalMenu* pMenu) override;
- virtual void DrawMenuBar() override;
virtual void registerDragSource(QtDragSource* pDragSource);
virtual void deregisterDragSource(QtDragSource const* pDragSource);
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index e6c111c1dab5..45ed72956656 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -144,7 +144,6 @@ public:
virtual void SetIcon( sal_uInt16 nIcon ) = 0;
virtual void SetRepresentedURL( const OUString& );
virtual void SetMenu( SalMenu *pSalMenu ) = 0;
- virtual void DrawMenuBar() = 0;
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 2adacd1ee5ba..80696439ea79 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -506,7 +506,6 @@ public:
virtual void SetIcon( sal_uInt16 nIcon ) override;
virtual void SetMenu( SalMenu *pSalMenu ) override;
SalMenu* GetMenu();
- virtual void DrawMenuBar() override;
void EnsureAppMenuWatch();
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 46d23f71aaf9..597657333128 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -215,7 +215,6 @@ public:
virtual void SetTitle( const OUString& rTitle ) override;
virtual void SetIcon( sal_uInt16 nIcon ) override;
virtual void SetMenu( SalMenu* pMenu ) override;
- virtual void DrawMenuBar() override;
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
virtual void Show( bool bVisible, bool bNoActivate = false ) override;
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index c37fb5b98915..0e3cbba81253 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -103,7 +103,6 @@ public:
virtual void SetTitle( const OUString& rTitle ) override;
virtual void SetIcon( sal_uInt16 nIcon ) override;
virtual void SetMenu( SalMenu* pSalMenu ) override;
- virtual void DrawMenuBar() override;
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
virtual void Show( bool bVisible, bool bNoActivate = false ) override;
virtual void SetMinClientSize( tools::Long nWidth, tools::Long nHeight ) override;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index e90b7edbf258..984ff8c5f5be 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1586,10 +1586,6 @@ LanguageType AquaSalFrame::GetInputLanguage()
return LANGUAGE_DONTKNOW;
}
-void AquaSalFrame::DrawMenuBar()
-{
-}
-
void AquaSalFrame::SetMenu( SalMenu* pSalMenu )
{
OSX_SALDATA_RUNINMAIN( SetMenu( pSalMenu ) )
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index ec28689199e7..31ca3c432be9 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -448,8 +448,6 @@ void QtFrame::SetIcon(sal_uInt16 nIcon)
void QtFrame::SetMenu(SalMenu*) {}
-void QtFrame::DrawMenuBar() { /* not needed */}
-
void QtFrame::SetExtendedFrameStyle(SalExtStyle /*nExtStyle*/) { /* not needed */}
void QtFrame::Show(bool bVisible, bool bNoActivate)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 51bad55d4cba..0109bb559503 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -863,10 +863,7 @@ void MenuBarWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
// no VCL paint if native menus
if (m_pMenu->ImplGetSalMenu() && m_pMenu->ImplGetSalMenu()->VisibleMenuBar())
- {
- ImplGetFrame()->DrawMenuBar();
return;
- }
// Make sure that all actual rendering happens in one go to avoid flicker.
vcl::BufferDevice pBuffer(this, rRenderContext);
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index bd0ffd7e0000..157032e7ecdc 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1779,11 +1779,6 @@ bool X11SalFrame::GetWindowState( vcl::WindowData* pState )
return true;
}
-// native menu implementation - currently empty
-void X11SalFrame::DrawMenuBar()
-{
-}
-
void X11SalFrame::SetMenu( SalMenu* )
{
}
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 65fc1be35b10..1341c759a029 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1653,10 +1653,6 @@ SalMenu* GtkSalFrame::GetMenu()
return m_pSalMenu;
}
-void GtkSalFrame::DrawMenuBar()
-{
-}
-
void GtkSalFrame::Center()
{
if (!GTK_IS_WINDOW(m_pWindow))
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 44ca954e28ad..2b2bd6cb7b72 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1110,11 +1110,6 @@ void WinSalFrame::SetMenu( SalMenu* pSalMenu )
::SetMenu( mhWnd, pWMenu->mhMenu );
}
-void WinSalFrame::DrawMenuBar()
-{
- ::DrawMenuBar( mhWnd );
-}
-
static HWND ImplGetParentHwnd( HWND hWnd )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
generated by cgit (git 2.34.1) at 2025-01-04 10:29:12 +0000