summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/aqua/inc/salframe.h6
-rw-r--r--vcl/aqua/inc/salmenu.h6
-rw-r--r--vcl/aqua/inc/salobj.h6
-rw-r--r--vcl/aqua/source/window/salmenu.cxx8
-rw-r--r--vcl/inc/vcl/svids.hrc7
-rw-r--r--vcl/inc/vcl/sysdata.hxx21
-rw-r--r--vcl/inc/vcl/window.h11
-rw-r--r--vcl/source/app/dbggui.cxx6
-rw-r--r--vcl/source/gdi/outdev6.cxx6
-rw-r--r--vcl/source/window/status.cxx6
10 files changed, 53 insertions, 30 deletions
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index 0e4f0ff4fe7f..de1efabf4a8c 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -4,9 +4,9 @@
*
* $RCSfile: salframe.h,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: rt $ $Date: 2007-07-05 16:00:33 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:42:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -45,7 +45,7 @@
#endif
#ifndef _SV_SYSDATA_HXX
-#include <sysdata.hxx>
+#include <vcl/sysdata.hxx>
#endif
#include <aquavcltypes.h>
diff --git a/vcl/aqua/inc/salmenu.h b/vcl/aqua/inc/salmenu.h
index 1c9a2e14269a..20d623557f92 100644
--- a/vcl/aqua/inc/salmenu.h
+++ b/vcl/aqua/inc/salmenu.h
@@ -4,9 +4,9 @@
*
* $RCSfile: salmenu.h,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2007-07-05 16:02:07 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:43:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -48,7 +48,7 @@
#endif
#ifndef _SV_SALMENU_HXX
-#include <salmenu.hxx>
+#include <vcl/salmenu.hxx>
#endif
diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h
index cb846b38c877..951d1f7242c3 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/aqua/inc/salobj.h
@@ -4,9 +4,9 @@
*
* $RCSfile: salobj.h,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: rt $ $Date: 2007-07-05 16:03:05 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:44:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -41,7 +41,7 @@
#endif
#ifndef _SV_SYSDATA_HXX
-#include <sysdata.hxx>
+#include <vcl/sysdata.hxx>
#endif
#include <vcl/salobj.hxx>
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 8767a9848694..17dd370960ed 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salmenu.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2007-07-05 08:31:52 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:43:00 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,8 +36,8 @@
#include <saldata.hxx>
#include <salinst.h>
#include <salmenu.h>
-#include <impbmp.hxx>
-#include <svids.hrc>
+#include <vcl/impbmp.hxx>
+#include <vcl/svids.hrc>
// nPos is 0 based, MenuItemIndex is 1 based
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,
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a9d27587ae5e..a27b93a98066 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dbggui.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: hr $ $Date: 2007-06-27 20:00:23 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:44:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -95,7 +95,7 @@
#include <vcl/threadex.hxx>
#ifndef _SV_DBGGUI_HXX
-#include <dbggui.hxx>
+#include <vcl/dbggui.hxx>
#endif
#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 5a71a5acaf4e..6a67c4fc46f2 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: outdev6.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: rt $ $Date: 2007-07-24 10:13:08 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:44:09 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -80,7 +80,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#endif
-#include <window.h>
+#include <vcl/window.h>
#include <vcl/svdata.hxx>
// ========================================================================
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index e8abbd1ddd23..fec2aa38448a 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: status.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: rt $ $Date: 2007-07-05 08:42:49 $
+ * last change: $Author: rt $ $Date: 2007-07-27 07:43:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -67,7 +67,7 @@
#ifndef _SV_VIRDEV_HXX
#include <vcl/virdev.hxx>
#endif
-#include <window.h>
+#include <vcl/window.h>
// =======================================================================
generated by cgit (git 2.34.1) at 2025-03-14 22:29:11 +0000