Kaydet (Commit) 25741af1 authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Jan Holesovsky

LOK: custom themes: isolate LO internals headers from theme plugin

Change-Id: Ic189aecf092b9cffd800e410d2d6e88016c43052
üst 7484f169
...@@ -17801,6 +17801,7 @@ vcl/inc/unx/x11_cursors/wsshow_curs.h ...@@ -17801,6 +17801,7 @@ vcl/inc/unx/x11_cursors/wsshow_curs.h
vcl/inc/unx/x11_cursors/wsshow_mask.h vcl/inc/unx/x11_cursors/wsshow_mask.h
vcl/inc/vcleventlisteners.hxx vcl/inc/vcleventlisteners.hxx
vcl/inc/vclpluginapi.h vcl/inc/vclpluginapi.h
vcl/inc/WidgetThemeLibraryTypes.hxx
vcl/inc/wall2.hxx vcl/inc/wall2.hxx
vcl/inc/win/DWriteTextRenderer.hxx vcl/inc/win/DWriteTextRenderer.hxx
vcl/inc/win/ScopedHDC.hxx vcl/inc/win/ScopedHDC.hxx
......
...@@ -8,14 +8,13 @@ ...@@ -8,14 +8,13 @@
* *
*/ */
#include <cairo.h>
#include <headless/CustomWidgetDraw.hxx> #include <headless/CustomWidgetDraw.hxx>
#include <vcl/salnativewidgets.hxx>
#include <sal/main.h> #include <sal/main.h>
#include <sal/config.h> #include <sal/config.h>
#include <rtl/bootstrap.hxx> #include <rtl/bootstrap.hxx>
#include <tools/svlibrary.h> #include <tools/svlibrary.h>
#include <osl/module.hxx> #include <osl/module.hxx>
#include <cairo.h>
#include <svdata.hxx> #include <svdata.hxx>
namespace vcl namespace vcl
......
...@@ -11,10 +11,11 @@ ...@@ -11,10 +11,11 @@
#ifndef INCLUDED_VCL_INC_WIDGETTHEME_HXX #ifndef INCLUDED_VCL_INC_WIDGETTHEME_HXX
#define INCLUDED_VCL_INC_WIDGETTHEME_HXX #define INCLUDED_VCL_INC_WIDGETTHEME_HXX
#include <cairo.h> /**
#include <vcl/dllapi.h> * This file expects cairo.h and the definition of
#include <vcl/salnativewidgets.hxx> * the other types used here to be defined before
#include <tools/color.hxx> * including it.
*/
namespace vcl namespace vcl
{ {
...@@ -52,9 +53,13 @@ struct ControlDrawParameters ...@@ -52,9 +53,13 @@ struct ControlDrawParameters
ControlState eState; ControlState eState;
ButtonValue eButtonValue; ButtonValue eButtonValue;
bool bIsStock; bool bIsStock;
sal_Int64 nValue; int64_t nValue;
}; };
#ifndef SAL_DLLPUBLIC_RTTI
#define SAL_DLLPUBLIC_RTTI
#endif
class SAL_DLLPUBLIC_RTTI WidgetThemeLibrary class SAL_DLLPUBLIC_RTTI WidgetThemeLibrary
{ {
public: public:
......
This diff is collapsed.
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#define INCLUDED_VCL_INC_CUSTOMWIDGETDRAW_HXX #define INCLUDED_VCL_INC_CUSTOMWIDGETDRAW_HXX
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/salnativewidgets.hxx>
#include <WidgetDrawInterface.hxx> #include <WidgetDrawInterface.hxx>
#include <WidgetThemeLibrary.hxx> #include <WidgetThemeLibrary.hxx>
#include <headless/svpgdi.hxx> #include <headless/svpgdi.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment