Enclose pgtk changes within #ifdef

* src/emacsgtkfixed.c:
* src/emacsgtkfixed.h:

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 49c3dab921189e307c39af8238eefbde113f97c8..78c952f8054380da3439fd5b2b4397dea5518257 100644 (file)
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -51,6 +51,9 @@ static void emacs_fixed_get_preferred_width  (GtkWidget *widget,
 static void emacs_fixed_get_preferred_height (GtkWidget *widget,
                                               gint      *minimum,
                                               gint      *natural);
+#ifndef HAVE_PGTK
+static GType emacs_fixed_get_type (void);
+#endif
 G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED)
 
 static EmacsFixed *

diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index 9b69bbb99db2b824784d129d78d9cccc4bc193aa..4f7a4eb3f715905947d04ec1e3121e1c09b525a6 100644 (file)
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -27,8 +27,10 @@ struct frame;
 
 G_BEGIN_DECLS
 
+#ifdef HAVE_PGTK
 #define EMACS_TYPE_FIXED        (emacs_fixed_get_type ())
 #define EMACS_IS_FIXED(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED))
+#endif
 
 struct frame;
 
@@ -47,7 +49,9 @@ struct _EmacsFixedClass
   GtkFixedClass parent_class;
 };
 
+#ifdef HAVE_PGTK
 extern GType emacs_fixed_get_type (void);
+#endif
 
 extern GtkWidget *emacs_fixed_new (struct frame *f);