diff options
| author | Oliver Braun <obr@openoffice.org> | 2001-02-14 07:32:01 +0000 |
|---|---|---|
| committer | Oliver Braun <obr@openoffice.org> | 2001-02-14 07:32:01 +0000 |
| commit | e86502362c7e7a4270add9ef9ff8841ebc35b18b (patch) | |
| tree | 6eebe43c4678bde2390d74fbc93ae2263722c05b /vcl/source/app | |
| parent | bbd1317363fbf9921da28064e7f2dc35d6b8f386 (diff) | |
TF_SVDATA
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 38aaf8b11d26..a4c71da84072 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svapp.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: pl $ $Date: 2001-02-01 14:08:05 $ + * last change: $Author: obr $ $Date: 2001-02-14 08:22:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,9 +130,11 @@ #ifndef _SV_IDLEMGR_HXX #include <idlemgr.hxx> #endif +#ifndef TF_SVDATA #ifndef _SV_DRAG_HXX #include <drag.hxx> #endif +#endif #ifndef _SV_SVAPP_HXX #include <svapp.hxx> #endif @@ -846,9 +848,15 @@ BOOL Application::IsUICaptured() // Wenn Mouse gecaptured, oder im TrackingModus oder im Auswahlmodus // eines FloatingWindows (wie Menus, Aufklapp-ToolBoxen) soll kein // weiteres Fenster aufgezogen werden +#ifdef TF_SVDATA + if ( pSVData->maWinData.mpCaptureWin || pSVData->maWinData.mpTrackWin || + pSVData->maWinData.mpFirstFloat || nImplSysDialog ) +#else + if ( pSVData->maWinData.mpCaptureWin || pSVData->maWinData.mpTrackWin || pSVData->maWinData.mpFirstFloat || DragManager::GetDragManager() || nImplSysDialog ) +#endif return TRUE; else return FALSE; diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index cd7cd1f93e77..343ddba5a2e1 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svmain.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: jsc $ $Date: 2001-01-24 15:32:08 $ + * last change: $Author: obr $ $Date: 2001-02-14 08:22:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,10 +130,12 @@ #ifndef _SV_SETTINGS_HXX #include <settings.hxx> #endif +#ifndef TF_SVDATA // HACK: Only for Exception-Hack #ifndef _SV_SYSEXCHG_HXX #include <sysexchg.hxx> #endif +#endif #include <vos/process.hxx> #include <osl/file.hxx> @@ -362,8 +364,10 @@ BOOL SVMain() pSVData->maGDIData.mpGrfConverter = new GraphicConverter; // Exception-Handler setzen +#ifndef TF_SVDATA // HACK: Hier SystemExchange initialisieren, damit Exception-Handler unter Windows funktioniert CreateSystemExchange(); +#endif ImplVCLExceptionHandler aExceptionHandler; // Debug-Daten initialisieren |