diff options
Diffstat (limited to 'vcl/source/window/dialog.cxx')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index da9482c7c69f..65a72fbd9172 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -466,8 +466,9 @@ void Dialog::ImplInitSettings() // ----------------------------------------------------------------------- -Dialog::Dialog( WindowType nType ) : - SystemWindow( nType ) +Dialog::Dialog( WindowType nType ) + : SystemWindow( nType ) + , mbIsDefferedInit(false) { ImplInitDialogData(); } @@ -514,11 +515,13 @@ void Dialog::doDeferredInit(bool bResizable) Window *pParent = mpDialogParent; mpDialogParent = NULL; ImplInit(pParent, nBits); + mbIsDefferedInit = false; } Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription) : SystemWindow( WINDOW_DIALOG ) , mpDialogParent(pParent) //will be unset in doDeferredInit + , mbIsDefferedInit(true) { ImplInitDialogData(); m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); @@ -527,6 +530,7 @@ Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rU Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType) : SystemWindow( nType ) , mpDialogParent(pParent) //will be unset in doDeferredInit + , mbIsDefferedInit(true) { ImplInitDialogData(); m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); @@ -535,8 +539,9 @@ Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rU // ----------------------------------------------------------------------- -Dialog::Dialog( Window* pParent, WinBits nStyle ) : - SystemWindow( WINDOW_DIALOG ) +Dialog::Dialog( Window* pParent, WinBits nStyle ) + : SystemWindow( WINDOW_DIALOG ) + , mbIsDefferedInit(false) { ImplInitDialogData(); ImplInit( pParent, nStyle ); @@ -544,8 +549,9 @@ Dialog::Dialog( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -Dialog::Dialog( Window* pParent, const ResId& rResId ) : - SystemWindow( WINDOW_DIALOG ) +Dialog::Dialog( Window* pParent, const ResId& rResId ) + : SystemWindow( WINDOW_DIALOG ) + , mbIsDefferedInit(false) { ImplInitDialogData(); rResId.SetRT( RSC_DIALOG ); |