From ddd0e56cd787c2f86e9a154cbb0b4ad09ee40f80 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 3 Oct 2012 13:03:49 +0100
Subject: handle children of deferred dialog better

Change-Id: I86f0a23408c031a99a31cd309defec519a2e91ec
---
 vcl/inc/vcl/builder.hxx | 1 +
 vcl/inc/vcl/dialog.hxx  | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'vcl/inc')

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 112e2939b9e9..191079151e21 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -116,6 +116,7 @@ private:
     OString m_sID;
     OString m_sHelpRoot;
     Window *m_pParent;
+    bool m_bToplevelHasDeferredInit;
     ParserState *m_pParserState;
 
     Window *get_by_name(OString sID);
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 63163225fb6d..107c29d1a464 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -58,6 +58,7 @@ private:
     sal_Bool            mbOldSaveBack;
     sal_Bool            mbInClose;
     sal_Bool            mbModalMode;
+    bool            mbIsDefferedInit;
     Timer           maLayoutTimer;
 
     SAL_DLLPRIVATE void    ImplInitDialogData();
@@ -81,6 +82,7 @@ public:
     SAL_DLLPRIVATE sal_Bool    IsInClose() const { return mbInClose; }
     SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); }
     SAL_DLLPRIVATE void doDeferredInit(bool bResizable);
+    SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
 
 protected:
                     Dialog( WindowType nType );
-- 
cgit v1.2.3