diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-20 13:05:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-23 12:33:44 +0200 |
| commit | c0af8057188c0e95831f9e6d1ef96a424da6f9b2 (patch) | |
| tree | 6509c67d0cfcc42e3b107004167f2efcccda43cd /vcl/unx | |
| parent | 27e26fc4286f66ab1bf4c807d86b8f3254c5c68b (diff) | |
weld SfxPrintOptionsDialog
and SwMMResultPrintDialog
Change-Id: Icded6a26a3a151293bea0c9173334cf634283e89
Reviewed-on: https://gerrit.libreoffice.org/53299
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index b2d46d91d753..dc1d4ebf54cd 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -524,7 +524,7 @@ void PspSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics ) } } -bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) +bool PspSalInfoPrinter::Setup( weld::Window* pFrame, ImplJobSetup* pJobSetup ) { if( ! pFrame || ! pJobSetup ) return false; @@ -540,7 +540,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) aInfo.m_bPapersizeFromSetup = pJobSetup->GetPapersizeFromSetup(); aInfo.meSetupMode = pJobSetup->GetPrinterSetupMode(); - if (SetupPrinterDriver(pFrame->GetFrameWeld(), aInfo)) + if (SetupPrinterDriver(pFrame, aInfo)) { aInfo.resolveDefaultBackend(); rtl_freeMemory( const_cast<sal_uInt8*>(pJobSetup->GetDriverData()) ); diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 20f94158612e..74a4c3473011 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1226,6 +1226,11 @@ public: return gtk_widget_get_visible(m_pWidget); } + virtual bool is_visible() const override + { + return gtk_widget_is_visible(m_pWidget); + } + virtual void grab_focus() override { gtk_widget_grab_focus(m_pWidget); @@ -1805,6 +1810,12 @@ public: return ret; } + virtual SystemEnvData get_system_data() const override + { + assert(false && "nothing should call this impl, yet anyway, if ever"); + return SystemEnvData(); + } + virtual ~GtkInstanceWindow() override { if (m_xWindow.is()) @@ -2025,6 +2036,11 @@ public: virtual weld::Button* get_widget_for_response(int nResponse) override; + virtual Container* weld_content_area() override + { + return new GtkInstanceContainer(GTK_CONTAINER(gtk_dialog_get_content_area(m_pDialog)), false); + } + virtual ~GtkInstanceDialog() override { g_signal_handler_disconnect(m_pDialog, m_nCloseSignalId); |