#i80086# vcl headers moving, bring back lost changes (patch by pjanik).

3 files changed, 31 insertions, 8 deletions

diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc
index 485dffcbbc6d..0e8bbac12c62 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/vcl/svids.hrc
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svids.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-24 10:02:13 $
+ *  last change: $Author: rt $ $Date: 2007-07-27 07:43:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -103,7 +103,8 @@
 #define SV_STDTEXT_DONTHINTAGAIN            10201
 #define SV_STDTEXT_DONTASKAGAIN             10202
 #define SV_STDTEXT_DONTWARNAGAIN            10203
-#define SV_STDTEXT_LAST                     SV_STDTEXT_DONTWARNAGAIN
+#define SV_STDTEXT_ABOUT                    10204
+#define SV_STDTEXT_LAST                     SV_STDTEXT_ABOUT
 
 #define SV_ACCESSERROR_FIRST                SV_ACCESSERROR_WRONG_VERSION
 #define SV_ACCESSERROR_WRONG_VERSION        10500
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 7a190e10df93..82716bbe2e43 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sysdata.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-24 10:02:22 $
+ *  last change: $Author: rt $ $Date: 2007-07-27 07:43:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,6 +36,12 @@
 #ifndef _SV_SYSDATA_HXX
 #define _SV_SYSDATA_HXX
 
+#if defined( QUARTZ )
+#include <premac.h>
+#include <Carbon/Carbon.h>
+#include <postmac.h>
+#endif
+
 // -----------------
 // - SystemEnvData -
 // -----------------
@@ -45,7 +51,11 @@ struct SystemEnvData
     unsigned long       nSize;          // size in bytes of this structure
 #if defined( WNT )
     HWND                hWnd;           // the window hwnd
-#elif defined( UNX )
+#elif defined( QUARTZ )
+    WindowRef           rWindow;        // Window reference
+#endif
+
+#if defined( UNX )
     void*               pDisplay;       // the relevant display connection
     long                aWindow;        // the window of the object
     void*               pSalFrame;      // contains a salframe, if object has one
@@ -70,6 +80,8 @@ struct SystemParentData
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )
     HWND            hWnd;           // the window hwnd
+#elif defined( QUARTZ )
+    WindowRef       rWindow;        // Window reference
 #elif defined( UNX )
     long            aWindow;        // the window of the object
 #endif
@@ -98,6 +110,8 @@ struct SystemGraphicsData
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )
     HDC             hDC;            // handle to a device context
+#elif defined( QUARTZ )
+    CGContextRef            rCGContext;     // QUARTZ graphic context
 #elif defined( UNX )
     long            hDrawable;      // a drawable
     void*           pRenderFormat;  // render format for drawable
@@ -113,6 +127,7 @@ struct SystemWindowData
 {
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )                  // meaningless on Windows
+#elif defined( QUARTZ )             // meaningless on Mac OS X / Quartz
 #elif defined( UNX )
     void*           pVisual;        // the visual to be used
 #endif
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h
index 53902058e48f..420ea510e6c4 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/vcl/window.h
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: window.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-24 10:03:09 $
+ *  last change: $Author: rt $ $Date: 2007-07-27 07:44:49 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -68,6 +68,8 @@
 #include <cppuhelper/weakref.hxx>
 #endif
 
+#include <vcl/salnativewidgets.hxx>
+
 #include <list>
 
 struct SalPaintEvent;
@@ -298,6 +300,7 @@ public:
     WinBits             mnExtendedStyle;
     WinBits             mnPrevExtendedStyle;
     WindowType          mnType;
+    ControlPart         mnNativeBackground;
     USHORT              mnWaitCount;
     USHORT              mnPaintFlags;
     USHORT              mnGetFocusFlags;
@@ -352,6 +355,10 @@ public:
                         mbDlgCtrlStart:1,
                         mbFocusVisible:1,
                         mbTrackVisible:1,
+                        mbUseNativeFocus:1,
+                        mbNativeFocusVisible:1,
+                        mbInShowFocus:1,
+                        mbInHideFocus:1,
                         mbControlForeground:1,
                         mbControlBackground:1,
                         mbAlwaysOnTop:1,