diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-20 17:22:19 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:56 +0100 |
| commit | 1bfd9b5465f1a2930210a54c285936c3ecb4bff5 (patch) | |
| tree | 8b690658e162b359607ef6a1b4a3f9a33ef54564 /vcl/inc/generic | |
| parent | generic: undo attempt at cross-platform headless for now (diff) | |
| download | core-1bfd9b5465f1a2930210a54c285936c3ecb4bff5.tar.gz core-1bfd9b5465f1a2930210a54c285936c3ecb4bff5.zip | |
generic: fix misc. initialization problems & simplify a little
Diffstat (limited to 'vcl/inc/generic')
| -rw-r--r-- | vcl/inc/generic/gendata.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx index 10b0a09fc66d..c52e8919f16a 100644 --- a/vcl/inc/generic/gendata.hxx +++ b/vcl/inc/generic/gendata.hxx @@ -39,7 +39,7 @@ class SalDisplay; class GtkSalDisplay; enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3, SAL_DATA_KDE3, SAL_DATA_KDE4, - SAL_DATA_UNX }; + SAL_DATA_UNX, SAL_DATA_SVP }; class VCL_DLLPUBLIC SalGenericData : public SalData { @@ -51,7 +51,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData // for transient storage of unicode strings eg. 'u123' by input methods rtl::OUString m_aUnicodeEntry; public: - SalGenericData( SalGenericDataType t ) : SalData(), m_eType( t ), m_pDisplay( NULL ) {} + SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; SetSalData( this ); } virtual ~SalGenericData() {} virtual void Dispose() {} @@ -80,7 +80,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData // Not the prettiest - but helpful for migrating old code ... inline SalDisplay *GetSalDisplay() const { - OSL_ASSERT( m_eType == SAL_DATA_UNX || m_eType == SAL_DATA_GTK ); + OSL_ASSERT( m_eType != SAL_DATA_GTK3 ); return (SalDisplay *)GetDisplay(); } inline GtkSalDisplay *GetGtkDisplay() const |