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/generic | |
| 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/generic')
| -rw-r--r-- | vcl/inc/generic/gendata.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx index 6cd17b26ca86..384c20a55549 100644 --- a/vcl/inc/generic/gendata.hxx +++ b/vcl/inc/generic/gendata.hxx @@ -12,12 +12,12 @@ #include <osl/socket.hxx> -#include <generic/gendisp.hxx> #include <saldatabasic.hxx> -#include <unx/saldisp.hxx> // Not the prettiest - but helpful for migrating old code ... class GtkSalDisplay; +class SalGenericDisplay; + enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3, SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4, SAL_DATA_UNX, SAL_DATA_SVP, @@ -61,11 +61,6 @@ class VCL_DLLPUBLIC SalGenericData : public SalData virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error // Not the prettiest - but helpful for migrating old code ... - inline SalDisplay *GetSalDisplay() const - { - OSL_ASSERT( m_eType != SAL_DATA_GTK3 ); - return static_cast<SalDisplay *>(GetDisplay()); - } inline GtkSalDisplay *GetGtkDisplay() const { return (GtkSalDisplay *)GetDisplay(); |