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/unx/gtk | |
| parent | 0dc6cb349ca1246a0febfaad15e5724fef2bd264 (diff) | |
generic: fix misc. initialization problems & simplify a little
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 9de7075c7d5c..27a2413a6c56 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -537,11 +537,11 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame ) * class GtkData * **********************************************************************/ -GtkData::GtkData() +GtkData::GtkData( SalInstance *pInstance ) #if GTK_CHECK_VERSION(3,0,0) - : SalGenericData( SAL_DATA_GTK3 ) + : SalGenericData( SAL_DATA_GTK3, pInstance ) #else - : SalGenericData( SAL_DATA_GTK ) + : SalGenericData( SAL_DATA_GTK, pInstance ) #endif { m_pUserEvent = NULL; diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index b50e38cc7904..b5b70c08d2bd 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -189,9 +189,7 @@ extern "C" #endif // initialize SalData - GtkData *pSalData = new GtkData(); - SetSalData( pSalData ); - pSalData->m_pInstance = pInstance; + GtkData *pSalData = new GtkData( pInstance ); pSalData->Init(); pSalData->initNWF(); |