diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-01 07:17:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-02 12:14:51 +0100 |
| commit | 05d4077b724f91fca736d3c3fd64f28e304d7172 (patch) | |
| tree | 5e7b6b1a86fccb274a92a3c31b6f97d389234337 /include/vcl/syswin.hxx | |
| parent | 2f1eed483930a96a40a7013a9338a7e0869fc960 (diff) | |
rearrange matters to get FloatingWindows working loaded from .ui
Change-Id: I099c810533c4590ee3182e1edf27e9038ed44f30
Diffstat (limited to 'include/vcl/syswin.hxx')
| -rw-r--r-- | include/vcl/syswin.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 033018b19ba2..168a0eb4a116 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -147,17 +147,19 @@ private: bool mbDockBtn; bool mbHideBtn; bool mbSysChild; - bool mbIsDefferedInit; bool mbIsCalculatingInitialLayoutSize; bool mbInitialLayoutDone; sal_uInt16 mnMenuBarMode; sal_uInt16 mnIcon; ImplData* mpImplData; Timer maLayoutTimer; - +protected: + bool mbIsDefferedInit; + Window* mpDialogParent; public: using Window::ImplIsInTaskPaneList; SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin ); + SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } private: SAL_DLLPRIVATE void Init(); @@ -168,7 +170,7 @@ private: protected: // Single argument ctors shall be explicit. explicit SystemWindow(WindowType nType); - explicit SystemWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType); + void loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); void SetWindowStateData( const WindowStateData& rData ); @@ -187,7 +189,6 @@ public: virtual void Resizing( Size& rSize ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_LAYOUT) SAL_OVERRIDE; bool isLayoutEnabled() const; void setOptimalLayoutSize(); @@ -274,6 +275,8 @@ public: const Link& GetCloseHdl() const; SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); } + + virtual void doDeferredInit(bool bResizable); }; #endif // INCLUDED_VCL_SYSWIN_HXX |