CWS-TOOLING: integrate CWS vcl104

1 files changed, 45 insertions, 41 deletions

diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index aeabdefc72a5..1d1eb3cb6bd3 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -44,6 +44,8 @@
 #include <utility>
 #include <stdexcept>
 
+#include <boost/shared_ptr.hpp>
+
 class AquaSalGraphics;
 class AquaSalFrame;
 class AquaSalTimer;
@@ -60,47 +62,49 @@ typedef struct SalFrame::SalPointerState SalPointerState;
 class AquaSalFrame : public SalFrame
 {
 public:
-    NSWindow*               mpWindow;               // Cocoa window
-    NSView*                 mpView;                 // Cocoa view (actually a custom view, see below
-    NSMenuItem*             mpDockMenuEntry;        // entry in the dynamic dock menu
-    NSRect                  maScreenRect;           // for mirroring purposes
-    AquaSalGraphics*        mpGraphics;             // current frame graphics
-    AquaSalFrame*           mpParent;               // pointer to parent frame
-     SystemEnvData          maSysData;              // system data
-    int                     mnMinWidth;             // min. client width in pixels
-    int                     mnMinHeight;            // min. client height in pixels
-    int                     mnMaxWidth;             // max. client width in pixels
-    int                     mnMaxHeight;            // max. client height in pixels
-    NSRect                  maFullScreenRect;       // old window size when in FullScreen
-    bool                    mbGraphics:1;           // is Graphics used?
-    bool                    mbFullScreen:1;         // is Window in FullScreen?
-    bool                    mbShown:1;
-    bool                    mbInitShow:1;
-    bool                    mbPositioned:1;
-    bool                    mbSized:1;
-    bool                    mbPresentation:1;
-
-    ULONG                   mnStyle;
-    unsigned int            mnStyleMask;            // our style mask from NSWindow creation
-
-    ULONG                   mnLastEventTime;
-    unsigned int            mnLastModifierFlags;
-    AquaSalMenu*            mpMenu;
-
-    SalExtStyle             mnExtStyle;             // currently document frames are marked this way
-
-    PointerStyle            mePointerStyle;         // currently active pointer style
-
-    NSTrackingRectTag       mnTrackingRectTag;      // used to get enter/leave messages
-
-    CGMutablePathRef        mrClippingPath;         // used for "shaping"
-    std::vector< CGRect >   maClippingRects;
-
-    std::list<AquaBlinker*> maBlinkers;
-
-    Rectangle               maInvalidRect;
-
-    ULONG                   mnICOptions;
+    NSWindow*                       mpWindow;               // Cocoa window
+    NSView*                         mpView;                 // Cocoa view (actually a custom view, see below
+    NSMenuItem*                     mpDockMenuEntry;        // entry in the dynamic dock menu
+    NSRect                          maScreenRect;           // for mirroring purposes
+    AquaSalGraphics*                mpGraphics;             // current frame graphics
+    AquaSalFrame*                   mpParent;               // pointer to parent frame
+     SystemEnvData                  maSysData;              // system data
+    int                             mnMinWidth;             // min. client width in pixels
+    int                             mnMinHeight;            // min. client height in pixels
+    int                             mnMaxWidth;             // max. client width in pixels
+    int                             mnMaxHeight;            // max. client height in pixels
+    NSRect                          maFullScreenRect;       // old window size when in FullScreen
+    bool                            mbGraphics:1;           // is Graphics used?
+    bool                            mbFullScreen:1;         // is Window in FullScreen?
+    bool                            mbShown:1;
+    bool                            mbInitShow:1;
+    bool                            mbPositioned:1;
+    bool                            mbSized:1;
+    bool                            mbPresentation:1;
+
+    ULONG                           mnStyle;
+    unsigned int                    mnStyleMask;            // our style mask from NSWindow creation
+
+    ULONG                           mnLastEventTime;
+    unsigned int                    mnLastModifierFlags;
+    AquaSalMenu*                    mpMenu;
+
+    SalExtStyle                     mnExtStyle;             // currently document frames are marked this way
+
+    PointerStyle                    mePointerStyle;         // currently active pointer style
+
+    NSTrackingRectTag               mnTrackingRectTag;      // used to get enter/leave messages
+
+    CGMutablePathRef                mrClippingPath;         // used for "shaping"
+    std::vector< CGRect >           maClippingRects;
+
+    std::list<AquaBlinker*>         maBlinkers;
+
+    Rectangle                       maInvalidRect;
+
+    ULONG                           mnICOptions;
+
+    boost::shared_ptr< Timer >      mpActivityTimer; // Timer to prevent system sleep during presentation
 public:
     /** Constructor