diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-13 09:15:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-13 11:28:19 +0100 |
| commit | a924d8f4c031504592a53e69c7c79c1359daa88a (patch) | |
| tree | 34f6c20d005a488e0dba9483a737e977f7509085 /vcl/unx/gtk | |
| parent | fb7b701c189a1b479dde6cc5a30c612825ce4bf7 (diff) | |
looks to me we can merge these ctors
Change-Id: Iab1e9888d35ecad7b1ca9713a571f32d59389cd1
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/salnativewidgets-gtk.cxx | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index a37102e0f30f..04d78222f90b 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -331,7 +331,9 @@ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG, GtkSalGraphics *pGtkSalGraphics = dynamic_cast<GtkSalGraphics*>(pG); assert(pGtkSalGraphics); return CreateX11VirtualDevice(pG, nDX, nDY, eFormat, pGd, - new GtkSalGraphics(pGtkSalGraphics->GetGtkFrame(), pGtkSalGraphics->GetGtkWidget())); + new GtkSalGraphics(pGtkSalGraphics->GetGtkFrame(), + pGtkSalGraphics->GetGtkWidget(), + pGtkSalGraphics->GetScreenNumber())); #endif } diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index 96f68851bc94..c09c9966b5c0 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -61,16 +61,6 @@ enum BG_BLACK }; -GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) - : X11SalGraphics(), - m_pWindow( pWindow ), - m_aClipRegion(true) -{ - Init( pFrame, GDK_WINDOW_XID( widget_get_window( pWindow ) ), - SalX11Screen( gdk_x11_screen_get_screen_number( - gtk_widget_get_screen( pWindow ) ) ) ); -} - GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow, SalX11Screen nXScreen ) : X11SalGraphics(), |