diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 18:26:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 18:29:31 +0100 |
| commit | 3042fa532a9b26203491b36f94d709c3b73e46ff (patch) | |
| tree | 11b75a3e6f3d71e930b71a456eac57439386edd3 /vcl/inc/unx/saldata.hxx | |
| parent | 967331ef6a2765b7021bf835ce85f783257a936c (diff) | |
Move SalGenericData::GetSalDisplay() out of generic/gendata.hxx
...as it needs SalDisplay to be a complete type, but unx/saldisp.hxx depends on
X11 headers and can thus e.g. not be included in generic/gendata.hxx on Android.
Change-Id: Iec5f51408eef0d6eb7e2d04105a7408372b06079
Diffstat (limited to 'vcl/inc/unx/saldata.hxx')
| -rw-r--r-- | vcl/inc/unx/saldata.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index f2f7b1e8cc15..2c5823177217 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -23,6 +23,7 @@ #include <prex.h> #include <postx.h> +#include <unx/saldisp.hxx> #include <unx/salunx.h> #include <vcl/salgtype.hxx> #include <salframe.hxx> @@ -68,7 +69,8 @@ public: virtual void initNWF(); virtual void deInitNWF(); - SalDisplay* GetX11Display() const { return GetSalDisplay(); } + SalDisplay* GetX11Display() const + { return vcl_sal::getSalDisplay(this); } void DeleteDisplay(); // for shutdown inline SalXLib* GetLib() const { return pXLib_; } |