diff options
| author | Yuuki Harano | 2021-11-23 22:59:18 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2021-11-23 22:59:18 +0900 |
| commit | a68575a8146277bd08b4d09b7ca4329c0e5212e0 (patch) | |
| tree | 9724c33ebb9221ba2b168820ab6b2bd51e3281b7 /src | |
| parent | bc53310aaf1a2b71c1476ae1fffb1b137fb8d617 (diff) | |
| download | emacs-a68575a8146277bd08b4d09b7ca4329c0e5212e0.tar.gz emacs-a68575a8146277bd08b4d09b7ca4329c0e5212e0.zip | |
Enclose pgtk changes within #ifdef
* src/emacsgtkfixed.c:
* src/emacsgtkfixed.h:
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacsgtkfixed.c | 3 | ||||
| -rw-r--r-- | src/emacsgtkfixed.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 49c3dab9211..78c952f8054 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c | |||
| @@ -51,6 +51,9 @@ static void emacs_fixed_get_preferred_width (GtkWidget *widget, | |||
| 51 | static void emacs_fixed_get_preferred_height (GtkWidget *widget, | 51 | static void emacs_fixed_get_preferred_height (GtkWidget *widget, |
| 52 | gint *minimum, | 52 | gint *minimum, |
| 53 | gint *natural); | 53 | gint *natural); |
| 54 | #ifndef HAVE_PGTK | ||
| 55 | static GType emacs_fixed_get_type (void); | ||
| 56 | #endif | ||
| 54 | G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED) | 57 | G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED) |
| 55 | 58 | ||
| 56 | static EmacsFixed * | 59 | static EmacsFixed * |
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h index 9b69bbb99db..4f7a4eb3f71 100644 --- a/src/emacsgtkfixed.h +++ b/src/emacsgtkfixed.h | |||
| @@ -27,8 +27,10 @@ struct frame; | |||
| 27 | 27 | ||
| 28 | G_BEGIN_DECLS | 28 | G_BEGIN_DECLS |
| 29 | 29 | ||
| 30 | #ifdef HAVE_PGTK | ||
| 30 | #define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) | 31 | #define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) |
| 31 | #define EMACS_IS_FIXED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED)) | 32 | #define EMACS_IS_FIXED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED)) |
| 33 | #endif | ||
| 32 | 34 | ||
| 33 | struct frame; | 35 | struct frame; |
| 34 | 36 | ||
| @@ -47,7 +49,9 @@ struct _EmacsFixedClass | |||
| 47 | GtkFixedClass parent_class; | 49 | GtkFixedClass parent_class; |
| 48 | }; | 50 | }; |
| 49 | 51 | ||
| 52 | #ifdef HAVE_PGTK | ||
| 50 | extern GType emacs_fixed_get_type (void); | 53 | extern GType emacs_fixed_get_type (void); |
| 54 | #endif | ||
| 51 | 55 | ||
| 52 | extern GtkWidget *emacs_fixed_new (struct frame *f); | 56 | extern GtkWidget *emacs_fixed_new (struct frame *f); |
| 53 | 57 | ||