nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-04 21:12:47 -05:00
Code Issues Projects Releases Wiki Activity

Introduce a config option for building on OS X GTK.

Browse Source 
Using GTK to run on OS X is going to require several workarounds and
behaviour tweaks to be enabled at various points in the code, and it's
already getting cumbersome to remember what they all are to put on the
command line. Here's a central #define (OSX_GTK) that enables them all
in one go, and a configure option (--with-quartz) that sets it.

As part of this commit, I've also rearranged the #include order in the
GTK source files, so that they include unix.h (which now might be
where NOT_X_WINDOWS gets defined) before they test NOT_X_WINDOWS to
decide whether to include X11 headers.
This commit is contained in:
Simon Tatham
2015-08-31 13:05:51 +01:00
parent 7acb747a7d
commit 1fa0b5a1ac
5 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unix/gtkfont.c
View File

@ -12,22 +12,24 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
#if !GTK_CHECK_VERSION(3,0,0)
#include <gdk/gdkkeysyms.h>
#endif
#ifndef NOT_X_WINDOWS
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#endif
#include "putty.h"
#include "gtkfont.h"
#include "gtkcompat.h"
#include "tree234.h"
#ifndef NOT_X_WINDOWS
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#endif
/*
* Future work:
*