diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-05 20:27:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 08:48:52 +0100 |
| commit | 2923907cbdc68b5723a00b92cbf6b6845c3c77f8 (patch) | |
| tree | a7d96808879db462688480dda7181e3cb986b195 /vcl | |
| parent | d2038058c0568041e1722e877aae2825931a8745 (diff) | |
GtkInstance should use default no-op I18NImeStatus
gtk3 already did, gtk2 claimed to support it, but
will use the built-in gtk support for this. So this
leaves this as gen/kde4 only now.
Change-Id: I640ffafc93bf45a4729ecd33f0f85f23fa67b4bf
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 02550fe0f3ce..1460557bed89 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -205,6 +205,7 @@ public: virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) override; + virtual SalI18NImeStatus* CreateI18NImeStatus() override; virtual SalSystem* CreateSalSystem() override; virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) override; virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index c131721a00c6..014ea7c2ff1e 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -232,6 +232,14 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow ); } +SalI18NImeStatus* GtkInstance::CreateI18NImeStatus() +{ + //we want the default SalInstance::CreateI18NImeStatus returns the no-op + //stub here, not the X11Instance::CreateI18NImeStatus which the gtk2 + //one would use otherwise + return SalInstance::CreateI18NImeStatus(); +} + extern "C" { typedef void*(* getDefaultFnc)(); |