diff options
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/gdi/cairo_xlib_cairo.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 3 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/cairo_gtk3_cairo.cxx | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx index a45faa4f8061..11d4e6cc19a1 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx @@ -301,9 +301,8 @@ namespace cairo **/ int X11Surface::getDepth() const { - if( maSysData.pRenderFormat ) + if (maSysData.pRenderFormat) return static_cast<XRenderPictFormat*>(maSysData.pRenderFormat)->depth; - return -1; } @@ -315,15 +314,13 @@ namespace cairo DeviceFormat X11Surface::getFormat() const { if (!maSysData.pRenderFormat) - return DeviceFormat::FULLCOLOR; + return DeviceFormat::DEFAULT; switch (static_cast<XRenderPictFormat*>(maSysData.pRenderFormat)->depth) { case 1: return DeviceFormat::BITMASK; - case 8: - return DeviceFormat::GRAYSCALE; default: - return DeviceFormat::FULLCOLOR; + return DeviceFormat::DEFAULT; } } } diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index d86677beb12d..97b1d3be778b 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -104,9 +104,6 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics* pGraphics, long &nDX, long case DeviceFormat::BITMASK: nBitCount = 1; break; - case DeviceFormat::GRAYSCALE: - nBitCount = 8; - break; default: nBitCount = pGraphics->GetBitCount(); break; diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 09ce9a089d81..39c34534ebd9 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -406,7 +406,7 @@ void GtkSalFrame::doKeyCallback( guint state, if (keyval == GDK_0) { fprintf( stderr, "force widget_queue_draw\n"); - gtk_widget_queue_draw (m_pFixedContainer); + gtk_widget_queue_draw(GTK_WIDGET(m_pFixedContainer)); return; } else if (keyval == GDK_1) diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx index 25e5a0ce1264..4f6c7934af78 100644 --- a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx +++ b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx @@ -109,7 +109,7 @@ namespace cairo VclPtr<VirtualDevice> Gtk3Surface::createVirtualDevice() const { - return VclPtrInstance<VirtualDevice>(nullptr, Size(1, 1), DeviceFormat::FULLCOLOR); + return VclPtrInstance<VirtualDevice>(nullptr, Size(1, 1), DeviceFormat::DEFAULT); } } |