[Libreoffice-commits] core.git: vcl/inc
Luboš Luňák (via logerrit)
logerrit at kemper.freedesktop.org
Mon Sep 28 16:48:32 UTC 2020
vcl/inc/unx/gtk/gtkgdi.hxx | 149 ---------------------------------------------
1 file changed, 149 deletions(-)
New commits:
commit 7b03de74740b054b5fe5f2ed8d7d2059b03dff4f
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Sep 28 15:57:22 2020 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Sep 28 18:47:53 2020 +0200
remove obsolete gtk2 code
This presumably should have been removed with 1ae450504cf57457f97,
and it went unnoticed because the #else matched with the include
guard.
Change-Id: Ib7a306bad4154b202c89e58cbaedac01c8366bb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103558
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
Tested-by: Jenkins
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 00201da8303c..745594877ac5 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -244,155 +244,6 @@ private:
static bool style_loaded;
};
-#else
-#include <unx/salgdi.h>
-
-class GdkX11Pixmap;
-class GtkSalGraphics : public X11SalGraphics
-{
- GtkWidget *m_pWindow;
- vcl::Region m_aClipRegion;
-
-public:
- GtkSalGraphics(GtkSalFrame *, GtkWidget *window, SalX11Screen nXScreen);
- virtual ~GtkSalGraphics() override;
-
- GtkWidget* GetGtkWidget() const { return m_pWindow; }
- GdkWindow* GetGdkWindow() const { return m_pWindow->window; }
- GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); }
- void SetWindow( GtkWidget* window ) { m_pWindow = window; }
-
- // will be set when UI theme was changed
- static bool bThemeChanged;
- static bool bNeedPixmapPaint;
- static bool bNeedTwoPasses;
-
-protected:
- // native widget methods
- bool isNativeControlSupported(ControlType, ControlPart) override;
- virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
- const Point& aPos, bool& rIsInside ) override;
- virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const OUString& rCaption, const Color& rBackgroundColor ) override;
- virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const OUString& rCaption,
- tools::Rectangle &rNativeBoundingRegion, tools::Rectangle &rNativeContentRegion ) override;
- bool updateSettings(AllSettings&) override;
-
-public:
- //helper methods for frame's UpdateSettings
- static void refreshFontconfig( GtkSettings *pSettings );
- static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
-
- virtual bool setClipRegion( const vcl::Region& ) override;
- virtual void ResetClipRegion() override;
-
- // some themes set the background pixmap of our window EVERY time
- // a control is painted; but presentation effects need
- // the background set to None; workaround: set the background
- // before copyBits
- virtual void copyBits( const SalTwoRect& rPosAry,
- SalGraphics* pSrcGraphics ) override;
-
- virtual OUString getRenderBackendName() const override { return "gtk3"; }
-
-protected:
-
- std::unique_ptr<GdkX11Pixmap> NWGetPixmapFromScreen( tools::Rectangle srcRect, int nBgColor = 0 );
- bool NWRenderPixmapToScreen( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask, tools::Rectangle dstRect );
-
- bool DoDrawNativeControl( GdkDrawable* pDrawable,
- ControlType nType,
- ControlPart nPart,
- const tools::Rectangle& aCtrlRect,
- const std::vector< tools::Rectangle >& aClip,
- ControlState nState,
- const ImplControlValue& aValue,
- ControlCacheKey& rControlCacheKey);
-
- bool NWPaintGTKArrow( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlPart nPart,
- const tools::Rectangle& rControlRectangle );
- bool NWPaintGTKFrame( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- const ImplControlValue& aValue );
- bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList );
- bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKButton( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKRadio( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKCheck( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKScrollbar( ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- ControlState nState, const ImplControlValue& aValue,
- ControlCacheKey& rControlCacheKey);
- bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKTabItem( ControlType nType,
- const tools::Rectangle& rControlRectangle,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
-
- bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList,
- ControlState nState );
- bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- const std::vector< tools::Rectangle >& rClipList );
- bool NWPaintGTKProgress(
- const tools::Rectangle& rControlRectangle,
- const ImplControlValue& aValue );
- bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlPart nPart,
- const tools::Rectangle& rControlRectangle,
- ControlState nState, const ImplControlValue& aValue );
- bool NWPaintGTKListNode( GdkDrawable* gdkDrawable,
- const tools::Rectangle& rControlRectangle,
- ControlState nState, const ImplControlValue& aValue );
-};
-
#endif // INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list