summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2018-11-09 09:20:06 +0100
committerJan Holesovsky <kendy@collabora.com>2018-11-09 18:42:37 +0100
commit717cdaf4bc864e0b96bfba5f3bc557afe751f50f (patch)
treeb6d438ee8e037e580d3fedc7e1001437a1af76c4 /vcl
parente6dcc08c3d1ebc896a047257b589552be7d72c7d (diff)
custom widgets: Fix various warnings.
Change-Id: I5d657fa4d6f63b93ad3775a5641d08c6e0f3a615
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/WidgetThemeLibrary.hxx4
-rw-r--r--vcl/inc/headless/CustomWidgetDraw.hxx2
-rw-r--r--vcl/inc/salgdi.hxx2
-rw-r--r--vcl/source/window/menufloatingwindow.cxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/WidgetThemeLibrary.hxx b/vcl/inc/WidgetThemeLibrary.hxx
index 84479af7bae5..ccb804cf1b6a 100644
--- a/vcl/inc/WidgetThemeLibrary.hxx
+++ b/vcl/inc/WidgetThemeLibrary.hxx
@@ -93,7 +93,7 @@ struct ControlDrawParameters
int64_t nValue;
};
-typedef struct _WidgetThemeLibrary WidgetThemeLibrary;
+typedef struct WidgetThemeLibrary_t WidgetThemeLibrary;
typedef struct _rectangle
{
@@ -101,7 +101,7 @@ typedef struct _rectangle
long width, height;
} rectangle_t;
-struct _WidgetThemeLibrary
+struct WidgetThemeLibrary_t
{
uint32_t nSize;
diff --git a/vcl/inc/headless/CustomWidgetDraw.hxx b/vcl/inc/headless/CustomWidgetDraw.hxx
index d0ddcea430bc..caa809e62f28 100644
--- a/vcl/inc/headless/CustomWidgetDraw.hxx
+++ b/vcl/inc/headless/CustomWidgetDraw.hxx
@@ -28,7 +28,7 @@ private:
public:
CustomWidgetDraw(SvpSalGraphics& rGraphics);
- virtual ~CustomWidgetDraw();
+ ~CustomWidgetDraw() override;
bool isNativeControlSupported(ControlType eType, ControlPart ePart) override;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index f8a643d7f662..b09f3223cdad 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -26,7 +26,7 @@
#include "salgdiimpl.hxx"
#include "sallayout.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <WidgetDrawInterface.hxx>
+#include "WidgetDrawInterface.hxx"
#include <config_cairo_canvas.h>
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index aa9bd5a8bc1c..ac79b1f0c510 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -144,7 +144,7 @@ void MenuFloatingWindow::ApplySettings(vcl::RenderContext& rRenderContext)
ImplGetFrame()->UpdateSettings(aSettings); // Update theme colors.
StyleSettings aStyle(aSettings.GetStyleSettings());
Color aHighlightTextColor = ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor;
- if (aHighlightTextColor != Color(COL_TRANSPARENT))
+ if (aHighlightTextColor != COL_TRANSPARENT)
{
aStyle.SetMenuHighlightTextColor(aHighlightTextColor);
}