Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GNOME
GIMP
Commits
7dbb9fee
Commit
7dbb9fee
authored
Oct 24, 2018
by
Alex Samorukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation on Mac 10.6 and 10.7 (
#2112
)
parent
62eabad7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
6 deletions
+20
-6
app/display/gimpimagewindow.c
app/display/gimpimagewindow.c
+4
-5
app/widgets/gimpwidgets-utils.c
app/widgets/gimpwidgets-utils.c
+1
-1
libgimpwidgets/gimppickbutton-quartz.c
libgimpwidgets/gimppickbutton-quartz.c
+15
-0
No files found.
app/display/gimpimagewindow.c
View file @
7dbb9fee
...
...
@@ -94,6 +94,10 @@
/* Whether the window's maximized or not */
#define GIMP_IMAGE_WINDOW_MAXIMIZED "maximized"
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
#define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8)
#endif
enum
{
...
...
@@ -633,12 +637,7 @@ gimp_image_window_map (GtkWidget *widget)
* as soon as GTK+ has proper support for this, we will migrate to the
* new-style full screen mode.
*/
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
ns_window
.
collectionBehavior
|=
NSWindowCollectionBehaviorFullScreenAuxiliary
;
#else
/* Hard code the define ... */
ns_window
.
collectionBehavior
|=
1
<<
8
;
#endif
#endif
/* !GDK_WINDOWING_QUARTZ */
}
...
...
app/widgets/gimpwidgets-utils.c
View file @
7dbb9fee
...
...
@@ -34,7 +34,7 @@
#endif
#ifdef PLATFORM_OSX
#include <
CoreGraph
ics/
CoreGraph
ics.h>
#include <
ApplicationServ
ic
e
s/
ApplicationServ
ic
e
s.h>
#endif
#include "libgimpbase/gimpbase.h"
...
...
libgimpwidgets/gimppickbutton-quartz.c
View file @
7dbb9fee
...
...
@@ -34,6 +34,21 @@
#include <ApplicationServices/ApplicationServices.h>
#endif
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
@
interface
NSWindow
(
GIMPExt
)
-
(
NSRect
)
convertRectToScreen
:
(
NSRect
)
aRect
;
@
end
@
implementation
NSWindow
(
GIMPExt
)
-
(
NSRect
)
convertRectToScreen
:
(
NSRect
)
aRect
{
NSRect
result
=
aRect
;
NSPoint
origin
=
result
.
origin
;
result
.
origin
=
[
self
convertBaseToScreen
:
origin
];
return
result
;
}
@
end
#endif
@
interface
GimpPickWindowController
:
NSObject
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment