diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 17:06:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 16:20:56 +0100 |
| commit | d07e7d692ddd2a9ab956a59bcc0f676c7d76bc10 (patch) | |
| tree | 061cd16a65c19d423a96b2d52b097150b4373575 /vcl/inc | |
| parent | 1156d1b29af15c0d7f1d185f8ce1dc8668940286 (diff) | |
wait until we know the UI language before initializing gtk
so that we can set LANGUAGE to get RTL mirroring for RTL
UI languages even under a LTR system locale
Change-Id: I31fce6f1620d7fb35a489c771285b15ba05773df
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/salinst.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index ba9a9b5b2c14..6fcb1e245732 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -65,6 +65,9 @@ public: SalInstance() {} virtual ~SalInstance(); + //called directly after Application::Init + virtual void AfterAppInit() {} + // Frame // DisplayName for Unix ??? virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index cf901ccd3848..4787b211569e 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -66,7 +66,8 @@ class GtkInstance : public X11SalInstance public: GtkInstance( SalYieldMutex* pMutex ); virtual ~GtkInstance(); - void Init(); + void EnsureInit(); + virtual void AfterAppInit(); virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); @@ -110,6 +111,7 @@ public: private: std::vector<GtkSalTimer *> m_aTimers; bool IsTimerExpired(); + bool bNeedsInit; mutable boost::shared_ptr<vcl::unx::GtkPrintWrapper> m_pPrintWrapper; }; |