merge with m40

5 files changed, 27 insertions, 5 deletions

diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx
index 108ed857350a..931369982f03 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/aqua/inc/saldata.hxx
@@ -42,6 +42,7 @@
 
 #include <list>
 #include <vector>
+#include <map>
 #include <hash_set>
 
 #include <cstdio>
@@ -99,6 +100,7 @@ struct SalData
 
     std::vector< NSCursor* >                      maCursors;
     std::vector< NSMenuItem* >                    maFallbackMenu;
+    std::map< NSEvent*, bool >                    maKeyEventAnswer;
 
     static oslThreadKey                           s_aAutoReleaseKey;
 
@@ -107,6 +109,8 @@ struct SalData
     MainController*                               mpMainController;         // Apple Remote
     bool                                          mbIsTestTool;
 
+    NSObject*                                     mpDockIconClickHandler;
+
     SalData();
     ~SalData();
 
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
index cd24910eb628..0b44d742d776 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/aqua/inc/salframeview.h
@@ -123,12 +123,26 @@
 -(void)moveDown: (id)aSender;
 -(void)moveWordBackward: (id)aSender;
 -(void)moveWordBackwardAndModifySelection: (id)aSender;
+-(void)moveWordLeftAndModifySelection: (id)aSender;
 -(void)moveWordForward: (id)aSender;
 -(void)moveWordForwardAndModifySelection: (id)aSender;
+-(void)moveWordRightAndModifySelection: (id)aSender;
 -(void)moveToEndOfLine: (id)aSender;
+-(void)moveToEndOfLineAndModifySelection: (id)aSender;
 -(void)moveToBeginningOfLine: (id)aSender;
+-(void)moveToBeginningOfLineAndModifySelection: (id)aSender;
 -(void)moveToEndOfParagraph: (id)aSender;
+-(void)moveToEndOfParagraphAndModifySelection: (id)aSender;
 -(void)moveToBeginningOfParagraph: (id)aSender;
+-(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender;
+-(void)moveParagraphForward: (id)aSender;
+-(void)moveParagraphForwardAndModifySelection: (id)aSender;
+-(void)moveParagraphBackward: (id)aSender;
+-(void)moveParagraphBackwardAndModifySelection: (id)aSender;
+-(void)moveToEndOfDocument: (id)aSender;
+-(void)moveToEndOfDocumentAndModifySelection: (id)aSender;
+-(void)moveToBeginningOfDocument: (id)aSender;
+-(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender;
 -(void)insertNewline: (id)aSender;
 -(void)deleteBackward: (id)aSender;
 -(void)deleteForward: (id)aSender;
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h
index d32ef0789f93..476400f1564b 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/aqua/inc/salgdi.h
@@ -102,6 +102,7 @@ protected:
     CGLayerRef                              mxLayer;    // Quartz graphics layer
     CGContextRef                            mrContext;  // Quartz drawing context
     class XorEmulation*                     mpXorEmulation;
+    int                                     mnXorMode; // 0: off 1: on 2: invert only
     int                                     mnWidth;
     int                                     mnHeight;
     int                                     mnBitmapDepth;  // zero unless bitmap
@@ -167,9 +168,9 @@ public:
     void                ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
 
     bool                CheckContext();
-    void                UpdateWindow( NSRect& rRect ); // delivered in NSView coordinates
+    void                UpdateWindow( NSRect& ); // delivered in NSView coordinates
     void                RefreshRect( const CGRect& );
-    void                RefreshRect( const NSRect& rRect );
+    void                RefreshRect( const NSRect& );
     void                RefreshRect(float lX, float lY, float lWidth, float lHeight);
 
     void                SetState();
@@ -264,7 +265,7 @@ public:
     // filled accordingly
     virtual void            SetFillColor( SalColor nSalColor );
     // enable/disable XOR drawing
-    virtual void            SetXORMode( BOOL bSet );
+    virtual void            SetXORMode( bool bSet, bool bInvertOnly );
     // set line color for raster operations
     virtual void            SetROPLineColor( SalROPColor nROPColor );
     // set fill color for raster operations
diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
index 703c3339ba37..b2cbc83d9f79 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/aqua/inc/salinst.h
@@ -169,6 +169,7 @@ public:
     static const short AppExecuteSVMain   = 0x7fff;
     static const short AppEndLoopEvent    = 1;
     static const short AppStartTimerEvent = 10;
+    static const short AppleRemoteEvent   = 15;
     static const short YieldWakeupEvent   = 20;
 
     static NSMenu* GetDynamicDockMenu();
diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/aqua/inc/vclnsapp.h
index de6c00617d2d..a5c339c238bd 100755
--- a/vcl/aqua/inc/vclnsapp.h
+++ b/vcl/aqua/inc/vclnsapp.h
@@ -61,8 +61,10 @@
 -(void)removeFallbackMenuItem: (NSMenuItem*)pOldItem;
 -(void)getSystemVersionMajor:(unsigned *)major minor:(unsigned *)minor bugFix:(unsigned *)bugFix;
 -(void)addDockMenuItem: (NSMenuItem*)pNewItem;
--(void)applicationWillBecomeActive:(NSNotification *)aNotification;
--(void)applicationWillResignActive:(NSNotification *)aNotification;
+-(void)applicationWillBecomeActive: (NSNotification *)pNotification;
+-(void)applicationWillResignActive: (NSNotification *)pNotification;
+-(MacOSBOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (MacOSBOOL)bWinVisible;
+-(void)setDockIconClickHandler: (NSObject*)pHandler;
 @end
 
 #endif