diff options
Diffstat (limited to 'vcl/inc/svdata.hxx')
| -rw-r--r-- | vcl/inc/svdata.hxx | 67 |
1 files changed, 32 insertions, 35 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index c4da2e8db51c..82ae80ebbde6 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -122,7 +122,7 @@ struct ImplSVAppData Help* mpHelp; // Application help PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute) ImplIdleMgr* mpIdleMgr; // Idle-Manager - ImplWheelWindow* mpWheelWindow; // WheelWindow + VclPtr<ImplWheelWindow> mpWheelWindow; // WheelWindow ImplHotKey* mpFirstHotKey; // HotKey-Verwaltung ImplEventHook* mpFirstEventHook; // Event-Hooks VclEventListeners2* mpPostYieldListeners; // post yield listeners @@ -153,18 +153,20 @@ struct ImplSVAppData struct ImplSVGDIData { - OutputDevice* mpFirstWinGraphics; // First OutputDevice with a Frame Graphics - OutputDevice* mpLastWinGraphics; // Last OutputDevice with a Frame Graphics - OutputDevice* mpFirstVirGraphics; // First OutputDevice with a VirtualDevice Graphics - OutputDevice* mpLastVirGraphics; // Last OutputDevice with a VirtualDevice Graphics - OutputDevice* mpFirstPrnGraphics; // First OutputDevice with a InfoPrinter Graphics - OutputDevice* mpLastPrnGraphics; // Last OutputDevice with a InfoPrinter Graphics - VirtualDevice* mpFirstVirDev; // First VirtualDevice - VirtualDevice* mpLastVirDev; // Last VirtualDevice + ~ImplSVGDIData(); + + VclPtr<OutputDevice> mpFirstWinGraphics; // First OutputDevice with a Frame Graphics + VclPtr<OutputDevice> mpLastWinGraphics; // Last OutputDevice with a Frame Graphics + VclPtr<OutputDevice> mpFirstVirGraphics; // First OutputDevice with a VirtualDevice Graphics + VclPtr<OutputDevice> mpLastVirGraphics; // Last OutputDevice with a VirtualDevice Graphics + VclPtr<OutputDevice> mpFirstPrnGraphics; // First OutputDevice with a InfoPrinter Graphics + VclPtr<OutputDevice> mpLastPrnGraphics; // Last OutputDevice with a InfoPrinter Graphics + VclPtr<VirtualDevice> mpFirstVirDev; // First VirtualDevice + VclPtr<VirtualDevice> mpLastVirDev; // Last VirtualDevice OpenGLContext* mpFirstContext; // First OpenGLContext OpenGLContext* mpLastContext; // Last OpenGLContext - Printer* mpFirstPrinter; // First Printer - Printer* mpLastPrinter; // Last Printer + VclPtr<Printer> mpFirstPrinter; // First Printer + VclPtr<Printer> mpLastPrinter; // Last Printer ImplPrnQueueList* mpPrinterQueueList; // List of all printer queue PhysicalFontCollection* mpScreenFontList; // Screen-Font-List ImplFontCache* mpScreenFontCache; // Screen-Font-Cache @@ -179,20 +181,20 @@ struct ImplSVGDIData struct ImplSVWinData { - vcl::Window* mpFirstFrame; // First FrameWindow - vcl::Window* mpDefDialogParent; // Default Dialog Parent - WorkWindow* mpAppWin; // Application-Window - vcl::Window* mpFocusWin; // window, that has the focus - vcl::Window* mpActiveApplicationFrame; // the last active application frame, can be used as DefModalDialogParent if no focuswin set - vcl::Window* mpCaptureWin; // window, that has the mouse capture - vcl::Window* mpLastDeacWin; // Window, that need a deactivate (FloatingWindow-Handling) - FloatingWindow* mpFirstFloat; // First FloatingWindow in PopupMode - Dialog* mpLastExecuteDlg; // First Dialog that is in Execute - vcl::Window* mpExtTextInputWin; // Window, which is in ExtTextInput - vcl::Window* mpTrackWin; // window, that is in tracking mode + VclPtr<vcl::Window> mpFirstFrame; // First FrameWindow + VclPtr<vcl::Window> mpDefDialogParent; // Default Dialog Parent + VclPtr<WorkWindow> mpAppWin; // Application-Window + VclPtr<vcl::Window> mpFocusWin; // window, that has the focus + VclPtr<vcl::Window> mpActiveApplicationFrame; // the last active application frame, can be used as DefModalDialogParent if no focuswin set + VclPtr<vcl::Window> mpCaptureWin; // window, that has the mouse capture + VclPtr<vcl::Window> mpLastDeacWin; // Window, that need a deactivate (FloatingWindow-Handling) + VclPtr<FloatingWindow> mpFirstFloat; // First FloatingWindow in PopupMode + VclPtr<Dialog> mpLastExecuteDlg; // First Dialog that is in Execute + VclPtr<vcl::Window> mpExtTextInputWin; // Window, which is in ExtTextInput + VclPtr<vcl::Window> mpTrackWin; // window, that is in tracking mode AutoTimer* mpTrackTimer; // tracking timer ImageList* mpMsgBoxImgList; // ImageList for MessageBox - vcl::Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode + VclPtr<vcl::Window> mpAutoScrollWin; // window, that is in AutoScrollMode mode sal_uInt16 mnTrackFlags; // tracking flags sal_uInt16 mnAutoScrollFlags; // auto scroll flags bool mbNoDeactivate; // true: do not execute Deactivate @@ -239,7 +241,7 @@ struct ImplSVHelpData bool mbKeyboardHelp : 1; // tiphelp was activated by keyboard bool mbAutoHelpId : 1; // generate HelpIds bool mbRequestingHelp : 1; // In Window::RequestHelp - HelpTextWindow* mpHelpWin; // HelpWindow + VclPtr<HelpTextWindow> mpHelpWin; // HelpWindow sal_uInt64 mnLastHelpHideTime; // ticks of last show }; @@ -307,7 +309,7 @@ struct ImplSVData SalData* mpSalData; SalInstance* mpDefInst; // Default SalInstance Application* mpApp; // pApp - WorkWindow* mpDefaultWin; // Default-Window + VclPtr<WorkWindow> mpDefaultWin; // Default-Window bool mbDeInit; // Is VCL deinitializing sal_uLong mnThreadCount; // is VCL MultiThread enabled ImplConfigData* mpFirstConfigData; // pointer to the first config block @@ -325,7 +327,7 @@ struct ImplSVData ImplSVHelpData maHelpData; // indepen data for Help classes ImplSVNWFData maNWFData; UnoWrapperBase* mpUnoWrapper; - vcl::Window* mpIntroWindow; // the splash screen + VclPtr<vcl::Window> mpIntroWindow; // the splash screen DockingManager* mpDockingManager; BlendFrameCache* mpBlendFrameCache; bool mbIsTestTool; @@ -372,15 +374,10 @@ FieldUnitStringList* ImplGetCleanedFieldUnits(); struct ImplDelData { ImplDelData* mpNext; - const vcl::Window* mpWindow; + VclPtr<vcl::Window> mpWindow; bool mbDel; - ImplDelData( const vcl::Window* pWindow = NULL ) : - mpNext( NULL ), - mpWindow( NULL ), - mbDel( false ) - { if( pWindow ) AttachToWindow( pWindow ); } - + ImplDelData( vcl::Window* pWindow = NULL ); virtual ~ImplDelData(); bool IsDead() const @@ -396,14 +393,14 @@ private: struct ImplFocusDelData : public ImplDelData { - vcl::Window* mpFocusWin; + VclPtr<vcl::Window> mpFocusWin; }; struct ImplSVEvent { void* mpData; Link* mpLink; - vcl::Window* mpWindow; + VclPtr<vcl::Window> mpWindow; ImplDelData maDelData; bool mbCall; }; |