diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:47 +0000 |
| commit | 839c46e19ac4aa00b619a185ad48ee977162ef2c (patch) | |
| tree | 01f1e79a4e164244941361adb0cf062098537f12 /libgimp | |
| parent | Adding debian version 2.10.36-3. (diff) | |
| download | gimp-839c46e19ac4aa00b619a185ad48ee977162ef2c.tar.xz gimp-839c46e19ac4aa00b619a185ad48ee977162ef2c.zip | |
Merging upstream version 2.10.38.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | libgimpbase/gimpversion.h | 4 | ||||
| -rw-r--r-- | libgimpwidgets/gimppickbutton-quartz.c | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libgimpbase/gimpversion.h b/libgimpbase/gimpversion.h index 5d6c163..c5cffd1 100644 --- a/libgimpbase/gimpversion.h +++ b/libgimpbase/gimpversion.h @@ -42,14 +42,14 @@ G_BEGIN_DECLS * * The micro GIMP version number. **/ -#define GIMP_MICRO_VERSION (36) +#define GIMP_MICRO_VERSION (38) /** * GIMP_VERSION: * * The GIMP version as a string. **/ -#define GIMP_VERSION "2.10.36" +#define GIMP_VERSION "2.10.38" /** * GIMP_API_VERSION: diff --git a/libgimpwidgets/gimppickbutton-quartz.c b/libgimpwidgets/gimppickbutton-quartz.c index 5d581d3..af64e84 100644 --- a/libgimpwidgets/gimppickbutton-quartz.c +++ b/libgimpwidgets/gimppickbutton-quartz.c @@ -59,6 +59,10 @@ { GimpPickButton *button; NSMutableArray *windows; +#ifndef __LP64__ + BOOL firstBecameKey; + NSCursor *cursor; +#endif } @property (nonatomic, assign) BOOL firstBecameKey; @@ -73,6 +77,9 @@ { GimpPickButton *button; GimpPickWindowController *controller; +#ifndef __LP64__ + NSTrackingArea *area; +#endif } @property (readonly,assign) NSTrackingArea *area; @@ -197,7 +204,7 @@ rect = [self.window convertRectToScreen:rect]; rect.origin.y = [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.origin.y; - root_image_ref = CGWindowListCreateImage (rect, + root_image_ref = CGWindowListCreateImage (NSRectToCGRect(rect), kCGWindowListOptionOnScreenOnly, kCGNullWindowID, kCGWindowImageDefault); |