GladeWidgetAdaptor: fix gir scanner warnings

Rename all macros starting with GWA to GLADE_WIDGET_ADAPTOR

87 files changed, 357 insertions, 357 deletions

diff --git a/gladeui/glade-adaptor-chooser-widget.c b/gladeui/glade-adaptor-chooser-widget.c
index 75867061..40746af3 100644
--- a/gladeui/glade-adaptor-chooser-widget.c
+++ b/gladeui/glade-adaptor-chooser-widget.c
@@ -316,7 +316,7 @@ treemodelfilter_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer d
       catalog = glade_widget_adaptor_get_catalog (adaptor);
       glade_project_get_target_version (priv->project, catalog, &major, &minor);
 
-      visible = GWA_VERSION_CHECK (adaptor, major, minor);
+      visible = GLADE_WIDGET_ADAPTOR_VERSION_CHECK (adaptor, major, minor);
     }
 
   if (visible && priv->flags)
@@ -325,13 +325,13 @@ treemodelfilter_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer d
       _GladeAdaptorChooserWidgetFlags flags = priv->flags;
 
        /* Skip adaptors according to flags */
-       if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_SKIP_DEPRECATED && GWA_DEPRECATED (adaptor))
+       if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_SKIP_DEPRECATED && GLADE_WIDGET_ADAPTOR_DEPRECATED (adaptor))
          visible = FALSE;
-       else if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_SKIP_TOPLEVEL && GWA_IS_TOPLEVEL (adaptor))
+       else if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_SKIP_TOPLEVEL && GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor))
          visible = FALSE;
        else if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_WIDGET && !g_type_is_a (type, GTK_TYPE_WIDGET))
          visible = FALSE;
-       else if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_TOPLEVEL && !GWA_IS_TOPLEVEL (adaptor))
+       else if (flags & GLADE_ADAPTOR_CHOOSER_WIDGET_TOPLEVEL && !GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor))
          visible = FALSE;
     }
 
diff --git a/gladeui/glade-adaptor-chooser.c b/gladeui/glade-adaptor-chooser.c
index 72782616..42ca56c2 100644
--- a/gladeui/glade-adaptor-chooser.c
+++ b/gladeui/glade-adaptor-chooser.c
@@ -126,7 +126,7 @@ on_adaptor_selected (GtkWidget           *widget,
   GladeAdaptorChooserPrivate *priv = GET_PRIVATE (chooser);
 
   /* Auto-create toplevel types */
-  if (GWA_IS_TOPLEVEL (adaptor))
+  if (GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor))
     {
       glade_command_create (adaptor, NULL, NULL, priv->project);
     }
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index 3a38eca6..f9b7164a 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -1216,7 +1216,7 @@ glade_command_add (GList            *widgets,
   widget  = GLADE_WIDGET (widgets->data);
   adaptor = glade_widget_get_adaptor (widget);
 
-  if (placeholder && GWA_IS_TOPLEVEL (adaptor) == FALSE)
+  if (placeholder && GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor) == FALSE)
     priv->project = glade_placeholder_get_project (placeholder);
   else
     priv->project = project;
@@ -1245,7 +1245,7 @@ glade_command_add (GList            *widgets,
       /* Parent */
       if (parent == NULL)
         cdata->parent = glade_widget_get_parent (widget);
-      else if (placeholder && GWA_IS_TOPLEVEL (adaptor) == FALSE)
+      else if (placeholder && GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor) == FALSE)
         cdata->parent = glade_placeholder_get_parent (placeholder);
       else
         cdata->parent = parent;
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index aa911d7b..efb7f9e9 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -2952,7 +2952,7 @@ glade_eprop_object_populate_view_real (GtkTreeStore *model,
 
           widget_name = glade_widget_get_display_name (widget);
           if (parentless)
-            good_type = good_type && !GWA_IS_TOPLEVEL (adaptor);
+            good_type = good_type && !GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor);
 
           if (good_type || has_decendant)
             {
diff --git a/gladeui/glade-palette.c b/gladeui/glade-palette.c
index bf36ce49..bc252463 100644
--- a/gladeui/glade-palette.c
+++ b/gladeui/glade-palette.c
@@ -243,7 +243,7 @@ palette_item_toggled_cb (GtkToggleToolButton *button, GladePalette *palette)
     return;
 
   /* Auto-create toplevel types */
-  if (GWA_IS_TOPLEVEL (adaptor))
+  if (GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor))
     {
       glade_command_create (adaptor, NULL, NULL, priv->project);
 
diff --git a/gladeui/glade-placeholder.c b/gladeui/glade-placeholder.c
index 03d40351..18b2d0bd 100644
--- a/gladeui/glade-placeholder.c
+++ b/gladeui/glade-placeholder.c
@@ -505,7 +505,7 @@ glade_placeholder_drag_can_drop (_GladeDrag *dest, gint x, gint y, GObject *data
     {
       GType otype = glade_widget_adaptor_get_object_type (GLADE_WIDGET_ADAPTOR (data));
 
-      if (g_type_is_a (otype, GTK_TYPE_WIDGET) && !GWA_IS_TOPLEVEL (data))
+      if (g_type_is_a (otype, GTK_TYPE_WIDGET) && !GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (data))
         return TRUE;
     }
   else if (GTK_IS_WIDGET (data))
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 9f474c2d..da5412fc 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -1841,10 +1841,10 @@ glade_project_introspect_gtk_version (GladeProject *project)
 
       /* Check widget class version */
       if (is_gtk_adaptor &&
-          !GWA_VERSION_CHECK (glade_widget_get_adaptor (widget), target_major, target_minor))
+          !GLADE_WIDGET_ADAPTOR_VERSION_CHECK (glade_widget_get_adaptor (widget), target_major, target_minor))
         {
-          target_major = GWA_VERSION_SINCE_MAJOR (glade_widget_get_adaptor (widget));
-          target_minor = GWA_VERSION_SINCE_MINOR (glade_widget_get_adaptor (widget));
+          target_major = GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (glade_widget_get_adaptor (widget));
+          target_minor = GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR (glade_widget_get_adaptor (widget));
         }
 
       /* Check all properties */
@@ -3569,7 +3569,7 @@ glade_project_verify_adaptor (GladeProject       *project,
       /* Only one versioning message (builder or otherwise)...
        */
       if ((flags & GLADE_VERIFY_VERSIONS) != 0 &&
-          !GWA_VERSION_CHECK (adaptor_iter, target_major, target_minor))
+          !GLADE_WIDGET_ADAPTOR_VERSION_CHECK (adaptor_iter, target_major, target_minor))
         {
           GLADE_NOTE (VERIFY, g_print ("VERIFY: Adaptor '%s' not available in version %d.%d\n",
                                        glade_widget_adaptor_get_name (adaptor_iter),
@@ -3579,8 +3579,8 @@ glade_project_verify_adaptor (GladeProject       *project,
             g_string_append_printf (string,
                                     WIDGET_VERSION_CONFLICT_MSGFMT,
                                     catalog,
-                                    GWA_VERSION_SINCE_MAJOR (adaptor_iter),
-                                    GWA_VERSION_SINCE_MINOR (adaptor_iter),
+                                    GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (adaptor_iter),
+                                    GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR (adaptor_iter),
                                     catalog, target_major, target_minor);
           else
             g_string_append_printf (string,
@@ -3588,15 +3588,15 @@ glade_project_verify_adaptor (GladeProject       *project,
                                     path_name, 
                                     glade_widget_adaptor_get_title (adaptor_iter),
                                     catalog,
-                                    GWA_VERSION_SINCE_MAJOR (adaptor_iter),
-                                    GWA_VERSION_SINCE_MINOR (adaptor_iter));
+                                    GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (adaptor_iter),
+                                    GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR (adaptor_iter));
 
           support_mask |= GLADE_SUPPORT_MISMATCH;
         }
 
       if ((flags & GLADE_VERIFY_DEPRECATIONS) != 0 &&
-          (GWA_DEPRECATED (adaptor_iter) ||
-           GWA_DEPRECATED_SINCE_CHECK (adaptor_iter, target_major, target_minor)))
+          (GLADE_WIDGET_ADAPTOR_DEPRECATED (adaptor_iter) ||
+           GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_CHECK (adaptor_iter, target_major, target_minor)))
         {
           GLADE_NOTE (VERIFY, g_print ("VERIFY: Adaptor '%s' is deprecated\n",
                                        glade_widget_adaptor_get_name (adaptor_iter)));
@@ -5383,7 +5383,7 @@ glade_project_command_paste (GladeProject     *project,
   /* Ignore parent argument if we are pasting a toplevel
    */
   if (g_list_length (glade_clipboard_widgets (clipboard)) == 1 &&
-      widget && GWA_IS_TOPLEVEL (glade_widget_get_adaptor (widget)))
+      widget && GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (glade_widget_get_adaptor (widget)))
     parent = NULL;
 
   /* Check if parent is actually a container of any sort */
@@ -5435,7 +5435,7 @@ glade_project_command_paste (GladeProject     *project,
     {
       widget = list->data;
 
-      if (!GWA_IS_TOPLEVEL (glade_widget_get_adaptor (widget)) && parent)
+      if (!GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (glade_widget_get_adaptor (widget)) && parent)
         {
           /* Count placeholder relations
            */
@@ -5452,7 +5452,7 @@ glade_project_command_paste (GladeProject     *project,
    * XXX: Not sure if this has to be true.
    */
   if (GTK_IS_WIDGET (glade_widget_get_object (widget)) &&
-      parent && !GWA_USE_PLACEHOLDERS (glade_widget_get_adaptor (parent)) &&
+      parent && !GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (glade_widget_get_adaptor (parent)) &&
       g_list_length (glade_clipboard_widgets (clipboard)) != 1)
     {
       glade_util_ui_message (glade_app_get_window (),
@@ -5464,7 +5464,7 @@ glade_project_command_paste (GladeProject     *project,
 
   /* Check that enough placeholders are available */
   if (parent &&
-      GWA_USE_PLACEHOLDERS (glade_widget_get_adaptor (parent)) &&
+      GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (glade_widget_get_adaptor (parent)) &&
       glade_util_count_placeholders (parent) < placeholder_relations)
     {
       glade_util_ui_message (glade_app_get_window (),
diff --git a/gladeui/glade-property-def.c b/gladeui/glade-property-def.c
index 39e1b257..d5dfaf3f 100644
--- a/gladeui/glade-property-def.c
+++ b/gladeui/glade-property-def.c
@@ -236,9 +236,9 @@ glade_property_def_new (GladeWidgetAdaptor *adaptor,
   property_def->create_type = NULL;
 
   /* Initialize property versions & deprecated to adaptor */
-  property_def->version_since_major = GWA_VERSION_SINCE_MAJOR (adaptor);
-  property_def->version_since_minor = GWA_VERSION_SINCE_MINOR (adaptor);
-  property_def->deprecated          = GWA_DEPRECATED (adaptor);
+  property_def->version_since_major = GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (adaptor);
+  property_def->version_since_minor = GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR (adaptor);
+  property_def->deprecated          = GLADE_WIDGET_ADAPTOR_DEPRECATED (adaptor);
 
   return property_def;
 }
diff --git a/gladeui/glade-signal-def.c b/gladeui/glade-signal-def.c
index 90269eaa..9c5116a0 100644
--- a/gladeui/glade-signal-def.c
+++ b/gladeui/glade-signal-def.c
@@ -81,9 +81,9 @@ glade_signal_def_new  (GladeWidgetAdaptor *adaptor,
   def->type = g_type_name (for_type);
 
   /* Initialize signal versions & deprecated to adaptor version */
-  def->version_since_major = GWA_VERSION_SINCE_MAJOR (adaptor);
-  def->version_since_minor = GWA_VERSION_SINCE_MINOR (adaptor);
-  def->deprecated          = GWA_DEPRECATED (adaptor);
+  def->version_since_major = GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (adaptor);
+  def->version_since_minor = GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR (adaptor);
+  def->deprecated          = GLADE_WIDGET_ADAPTOR_DEPRECATED (adaptor);
 
   return def;
 }
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index f713bf62..a7217dbc 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -299,7 +299,7 @@ glade_util_check_and_warn_scrollable (GladeWidget *parent,
                                       GtkWidget *parent_widget)
 {
   if (GTK_IS_SCROLLED_WINDOW (glade_widget_get_object (parent)) &&
-      GWA_SCROLLABLE_WIDGET (child_adaptor) == FALSE)
+      GLADE_WIDGET_ADAPTOR_SCROLLABLE_WIDGET (child_adaptor) == FALSE)
     {
       GladeWidgetAdaptor *vadaptor =
           glade_widget_adaptor_get_by_type (GTK_TYPE_VIEWPORT);
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index 9922f856..f26f3914 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -2989,7 +2989,7 @@ glade_widget_adaptor_from_catalog (GladeCatalog *catalog,
                         glade_catalog_get_domain (catalog));
 
   /* Finalize the icon and overlay it if it's deprecated */
-  if (GWA_DEPRECATED (adaptor))
+  if (GLADE_WIDGET_ADAPTOR_DEPRECATED (adaptor))
     {
       gchar *deprecated_icon = generate_deprecated_icon (priv->icon_name);
 
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h
index 3e5268d4..d1b4d9b0 100644
--- a/gladeui/glade-widget-adaptor.h
+++ b/gladeui/glade-widget-adaptor.h
@@ -17,34 +17,34 @@ G_BEGIN_DECLS
 G_DECLARE_DERIVABLE_TYPE (GladeWidgetAdaptor, glade_widget_adaptor, GLADE, WIDGET_ADAPTOR, GObject)
 
 /**
- * GWA_DEPRECATED:
+ * GLADE_WIDGET_ADAPTOR_DEPRECATED:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks whether this widget class is marked as deprecated
  */
-#define GWA_DEPRECATED(obj) \
+#define GLADE_WIDGET_ADAPTOR_DEPRECATED(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->deprecated : FALSE)
 
 /**
- * GWA_VERSION_SINCE_MAJOR:
+ * GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks major version in which this widget was introduced
  */
-#define GWA_VERSION_SINCE_MAJOR(obj) \
+#define GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->version_since_major : 0)
 
 /**
- * GWA_VERSION_SINCE_MINOR:
+ * GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks minor version in which this widget was introduced
  */
-#define GWA_VERSION_SINCE_MINOR(obj) \
+#define GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->version_since_minor : 0)
 
 /**
- * GWA_VERSION_CHECK:
+ * GLADE_WIDGET_ADAPTOR_VERSION_CHECK:
  * @adaptor: A #GladeWidgetAdaptor
  * @major_version: The major version to check
  * @minor_version: The minor version to check
@@ -52,31 +52,31 @@ G_DECLARE_DERIVABLE_TYPE (GladeWidgetAdaptor, glade_widget_adaptor, GLADE, WIDGE
  * Evaluates to %TRUE if @adaptor is available in its owning library version-@major_verion.@minor_version.
  *
  */
-#define GWA_VERSION_CHECK(adaptor, major_version, minor_version) \
-  ((GWA_VERSION_SINCE_MAJOR (adaptor) == major_version) ?        \
-   (GWA_VERSION_SINCE_MINOR (adaptor) <= minor_version) :        \
-   (GWA_VERSION_SINCE_MAJOR (adaptor) <= major_version))
+#define GLADE_WIDGET_ADAPTOR_VERSION_CHECK(adaptor, major_version, minor_version) \
+  ((GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (adaptor) == major_version) ?        \
+   (GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MINOR (adaptor) <= minor_version) :        \
+   (GLADE_WIDGET_ADAPTOR_VERSION_SINCE_MAJOR (adaptor) <= major_version))
 
 /**
- * GWA_DEPRECATED_SINCE_MAJOR:
+ * GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MAJOR:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks major version in which this widget was deprecated
  */
-#define GWA_DEPRECATED_SINCE_MAJOR(obj) \
+#define GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MAJOR(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->deprecated_since_major : 0)
 
 /**
- * GWA_DEPRECATED_SINCE_MINOR:
+ * GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MINOR:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks minor version in which this widget was deprecated
  */
-#define GWA_DEPRECATED_SINCE_MINOR(obj) \
+#define GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MINOR(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->deprecated_since_minor : 0)
 
 /**
- * GWA_DEPRECATED_SINCE_CHECK:
+ * GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_CHECK:
  * @adaptor: A #GladeWidgetAdaptor
  * @major_version: The major version to check
  * @minor_version: The minor version to check
@@ -84,87 +84,87 @@ G_DECLARE_DERIVABLE_TYPE (GladeWidgetAdaptor, glade_widget_adaptor, GLADE, WIDGE
  * Evaluates to %TRUE if @adaptor is deprecated in its owning library version-@major_verion.@minor_version.
  *
  */
-#define GWA_DEPRECATED_SINCE_CHECK(adaptor, major_version, minor_version)           \
-  ((GWA_DEPRECATED_SINCE_MAJOR (adaptor) || GWA_DEPRECATED_SINCE_MINOR (adaptor)) ? \
-    ((GWA_DEPRECATED_SINCE_MAJOR (adaptor) == major_version)  ?                     \
-      (GWA_DEPRECATED_SINCE_MINOR (adaptor) <= minor_version)  :                    \
-      (GWA_DEPRECATED_SINCE_MAJOR (adaptor) <= major_version)) :                    \
+#define GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_CHECK(adaptor, major_version, minor_version)           \
+  ((GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MAJOR (adaptor) || GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MINOR (adaptor)) ? \
+    ((GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MAJOR (adaptor) == major_version)  ?                     \
+      (GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MINOR (adaptor) <= minor_version)  :                    \
+      (GLADE_WIDGET_ADAPTOR_DEPRECATED_SINCE_MAJOR (adaptor) <= major_version)) :                    \
     FALSE)
 
 /**
- * GWA_IS_TOPLEVEL:
+ * GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks whether this widget class has been marked as
  * a toplevel one.
  */
-#define GWA_IS_TOPLEVEL(obj) \
+#define GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->toplevel : FALSE)
 
 /**
- * GWA_USE_PLACEHOLDERS:
+ * GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks whether this widget class has been marked to
  * use placeholders in child widget operations
  */
-#define GWA_USE_PLACEHOLDERS(obj) \
+#define GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->use_placeholders : FALSE)
 
 
 /**
- * GWA_DEFAULT_WIDTH:
+ * GLADE_WIDGET_ADAPTOR_DEFAULT_WIDTH:
  * @obj: A #GladeWidgetAdaptor
  *
  * Returns: the default width to be used when this widget
  * is toplevel in the GladeDesignLayout
  */
-#define GWA_DEFAULT_WIDTH(obj) \
+#define GLADE_WIDGET_ADAPTOR_DEFAULT_WIDTH(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->default_width : -1)
 
 
 /**
- * GWA_DEFAULT_HEIGHT:
+ * GLADE_WIDGET_ADAPTOR_DEFAULT_HEIGHT:
  * @obj: A #GladeWidgetAdaptor
  *
  * Returns: the default width to be used when this widget
  * is toplevel in the GladeDesignLayout
  */
-#define GWA_DEFAULT_HEIGHT(obj) \
+#define GLADE_WIDGET_ADAPTOR_DEFAULT_HEIGHT(obj) \
   ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->default_height : -1)
 
 
 /**
- * GWA_SCROLLABLE_WIDGET:
+ * GLADE_WIDGET_ADAPTOR_SCROLLABLE_WIDGET:
  * @obj: A #GladeWidgetAdaptor
  *
  * Checks whether this is a GtkWidgetClass with scrolling capabilities.
  */
-#define GWA_SCROLLABLE_WIDGET(obj)                   \
+#define GLADE_WIDGET_ADAPTOR_SCROLLABLE_WIDGET(obj)                   \
   ((obj) ?                                           \
    g_type_is_a (glade_widget_adaptor_get_object_type \
                 (GLADE_WIDGET_ADAPTOR (obj)),        \
                 GTK_TYPE_SCROLLABLE) : FALSE)
 
 /**
- * GWA_GET_CLASS:
+ * GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS:
  * @type: A #GType
  *
  * Shorthand for referencing glade adaptor classes from
- * the plugin eg. GWA_GET_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor...
+ * the plugin eg. GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor...
  */
-#define GWA_GET_CLASS(type)                                                   \
+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS(type)                                                   \
   (((type) == G_TYPE_OBJECT) ?                                                \
    (GladeWidgetAdaptorClass *)g_type_class_peek (GLADE_TYPE_WIDGET_ADAPTOR) : \
    GLADE_WIDGET_ADAPTOR_GET_CLASS (glade_widget_adaptor_get_by_type(type)))
 
 /**
- * GWA_GET_OCLASS:
+ * GLADE_WIDGET_ADAPTOR_GET_OCLASS:
  * @type: A #GType.
  *
- * Same as GWA_GET_CLASS but casted to GObjectClass
+ * Same as GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS but casted to GObjectClass
  */
-#define GWA_GET_OCLASS(type) ((GObjectClass*)GWA_GET_CLASS(type))
+#define GLADE_WIDGET_ADAPTOR_GET_OCLASS(type) ((GObjectClass*)GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS(type))
 
 
 #define GLADE_VALID_CREATE_REASON(reason) (reason >= 0 && reason < GLADE_CREATE_REASONS)
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 8c62e698..e98b3137 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -911,8 +911,8 @@ glade_widget_constructor (GType                  type,
     }
 
   /* Setup width/height */
-  gwidget->priv->width = GWA_DEFAULT_WIDTH (gwidget->priv->adaptor);
-  gwidget->priv->height = GWA_DEFAULT_HEIGHT (gwidget->priv->adaptor);
+  gwidget->priv->width = GLADE_WIDGET_ADAPTOR_DEFAULT_WIDTH (gwidget->priv->adaptor);
+  gwidget->priv->height = GLADE_WIDGET_ADAPTOR_DEFAULT_HEIGHT (gwidget->priv->adaptor);
 
   /* Introspect object properties before passing it to post_create,
    * but only when its freshly created (depend on glade file at
@@ -1257,7 +1257,7 @@ glade_widget_drag_can_drop (_GladeDrag *dest, gint x, gint y, GObject *data)
     {
       GType otype = glade_widget_adaptor_get_object_type (GLADE_WIDGET_ADAPTOR (data));
 
-      if (g_type_is_a (otype, GTK_TYPE_WIDGET) && !GWA_IS_TOPLEVEL (data))
+      if (g_type_is_a (otype, GTK_TYPE_WIDGET) && !GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (data))
         return TRUE;
     }
   else
@@ -1764,7 +1764,7 @@ glade_widget_dup_internal (GladeWidget *main_target,
   for (l = gwidget->priv->properties; l; l = l->next)
     glade_property_load (GLADE_PROPERTY (l->data));
 
-  if (GWA_IS_TOPLEVEL (gwidget->priv->adaptor) && GTK_IS_WIDGET (gwidget->priv->object))
+  if (GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (gwidget->priv->adaptor) && GTK_IS_WIDGET (gwidget->priv->object))
     g_object_set (gwidget,
                   "toplevel-width", template_widget->priv->width,
                   "toplevel-height", template_widget->priv->height, NULL);
@@ -4588,7 +4588,7 @@ glade_widget_placeholder_relation (GladeWidget *parent, GladeWidget *widget)
 
   return (GTK_IS_CONTAINER (parent->priv->object) &&
           GTK_IS_WIDGET (widget->priv->object) &&
-          GWA_USE_PLACEHOLDERS (parent->priv->adaptor));
+          GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (parent->priv->adaptor));
 }
 
 static GladeWidgetAction *
diff --git a/plugins/gladeui/glade-glade-editor-skeleton.c b/plugins/gladeui/glade-glade-editor-skeleton.c
index b8a7cddf..08f62b13 100644
--- a/plugins/gladeui/glade-glade-editor-skeleton.c
+++ b/plugins/gladeui/glade-glade-editor-skeleton.c
@@ -37,7 +37,7 @@ glade_glade_editor_skeleton_read_widget (GladeWidgetAdaptor *adaptor,
   GladeProperty *property;
   gchar *string = NULL;
 
-  GWA_GET_CLASS (GTK_TYPE_BOX)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_BOX)->read_widget (adaptor, widget, node);
 
   if ((editors_node =
        glade_xml_search_child (node, GLADE_TAG_SKELETON_EDITORS)) != NULL)
@@ -91,7 +91,7 @@ glade_glade_editor_skeleton_write_widget_after (GladeWidgetAdaptor *adaptor,
   GList *editors = NULL, *list;
   GladeWidget *awidget;
 
-  GWA_GET_CLASS (GTK_TYPE_BOX)->write_widget_after (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_BOX)->write_widget_after (adaptor, widget, context, node);
 
   widgets_node = glade_xml_node_new (context, GLADE_TAG_SKELETON_EDITORS);
 
diff --git a/plugins/gtk+/glade-fixed.c b/plugins/gtk+/glade-fixed.c
index 7388f635..f65c8ae2 100644
--- a/plugins/gtk+/glade-fixed.c
+++ b/plugins/gtk+/glade-fixed.c
@@ -970,7 +970,7 @@ glade_fixed_event (GladeWidget *gwidget_fixed, GdkEvent *event)
     }
 
   /* If the container uses placeholder adding widget is already taken care of */
-  if (GWA_USE_PLACEHOLDERS (glade_widget_get_adaptor (gwidget_fixed)))
+  if (GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (glade_widget_get_adaptor (gwidget_fixed)))
     return FALSE;
   
   switch (event->type)
diff --git a/plugins/gtk+/glade-gtk-about-dialog.c b/plugins/gtk+/glade-gtk-about-dialog.c
index 469ebc6f..3b866236 100644
--- a/plugins/gtk+/glade-gtk-about-dialog.c
+++ b/plugins/gtk+/glade-gtk-about-dialog.c
@@ -64,7 +64,7 @@ glade_gtk_about_dialog_construct_object (GladeWidgetAdaptor *adaptor,
       g_value_set_int (&use_header->value, 0);
     }
 
-  retval = GWA_GET_CLASS (GTK_TYPE_DIALOG)->construct_object (adaptor, n_parameters, new_params);
+  retval = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_DIALOG)->construct_object (adaptor, n_parameters, new_params);
   g_free (new_params);
   return retval;
 }
@@ -80,7 +80,7 @@ glade_gtk_about_dialog_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
 
   /* Sync the logo icon mode */
   if (glade_widget_property_original_default (widget, "logo") == FALSE)
@@ -109,5 +109,5 @@ glade_gtk_about_dialog_set_property (GladeWidgetAdaptor *adaptor,
       glade_property_set_enabled (logo, as_file);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_DIALOG)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_DIALOG)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-action-bar.c b/plugins/gtk+/glade-gtk-action-bar.c
index 4168e6ee..b5cf4e9f 100644
--- a/plugins/gtk+/glade-gtk-action-bar.c
+++ b/plugins/gtk+/glade-gtk-action-bar.c
@@ -39,7 +39,7 @@ glade_gtk_action_bar_create_editable (GladeWidgetAdaptor * adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_action_bar_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static void
@@ -107,7 +107,7 @@ glade_gtk_action_bar_get_children (GladeWidgetAdaptor * adaptor,
 {
   GList *children;
 
-  children = GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
+  children = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
 
   return g_list_sort_with_data (children, (GCompareDataFunc) sort_children, container);
 }
@@ -176,7 +176,7 @@ glade_gtk_action_bar_set_child_property (GladeWidgetAdaptor * adaptor,
   else if (!strcmp (id, "pack-type"))
     glade_gtk_action_bar_set_child_pack_type (container, child, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor, container,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor, container,
                                                             child, id, value);
 
   gtk_container_check_resize (GTK_CONTAINER (container));
@@ -210,7 +210,7 @@ glade_gtk_action_bar_get_property (GladeWidgetAdaptor * adaptor,
       g_value_set_int (value, glade_gtk_action_bar_get_num_children (object));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
 }
 
 static gint
@@ -333,7 +333,7 @@ glade_gtk_action_bar_set_property (GladeWidgetAdaptor * adaptor,
   else if (!strcmp (id, "size"))
     glade_gtk_action_bar_set_size (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
 static gboolean
@@ -371,8 +371,8 @@ glade_gtk_action_bar_verify_property (GladeWidgetAdaptor * adaptor,
 {
   if (!strcmp (id, "size"))
     return glade_gtk_action_bar_verify_size (object, value);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object, id, value);
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object, id, value);
 
   return TRUE;
 }
diff --git a/plugins/gtk+/glade-gtk-action.c b/plugins/gtk+/glade-gtk-action.c
index 70ddbd9d..6623753f 100644
--- a/plugins/gtk+/glade-gtk-action.c
+++ b/plugins/gtk+/glade-gtk-action.c
@@ -70,7 +70,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
         editable = (GladeEditable *) glade_action_editor_new ();
     }
   else
-    editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
+    editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
 
   return editable;
 }
diff --git a/plugins/gtk+/glade-gtk-adjustment.c b/plugins/gtk+/glade-gtk-adjustment.c
index a7a16561..0fe9465e 100644
--- a/plugins/gtk+/glade-gtk-adjustment.c
+++ b/plugins/gtk+/glade-gtk-adjustment.c
@@ -47,7 +47,7 @@ glade_gtk_adjustment_write_widget (GladeWidgetAdaptor *adaptor,
   prop = glade_widget_get_property (widget, "value");
   glade_property_write (prop, context, node);
 
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 }
 
 static gint
@@ -109,7 +109,7 @@ glade_gtk_adjustment_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
 
   glade_widget_property_set (widget, "glade-digits", get_digits (widget), NULL);
 }
@@ -139,7 +139,7 @@ glade_gtk_adjustment_set_property (GladeWidgetAdaptor *adaptor,
                     "precision", digits, NULL);
     }
   else
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
                                                  property_name, value);
 }
 
diff --git a/plugins/gtk+/glade-gtk-app-chooser-button.c b/plugins/gtk+/glade-gtk-app-chooser-button.c
index 9155008e..7e986663 100644
--- a/plugins/gtk+/glade-gtk-app-chooser-button.c
+++ b/plugins/gtk+/glade-gtk-app-chooser-button.c
@@ -35,7 +35,7 @@ glade_gtk_app_chooser_button_post_create (GladeWidgetAdaptor *adaptor,
   GladeWidget *gwidget;
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->post_create (adaptor, object, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_COMBO_BOX)->post_create (adaptor, object, reason);
 
   /* No customization of the cell renderers on a GtkAppChooserButton. */
   gwidget = glade_widget_get_from_gobject (object);
@@ -51,5 +51,5 @@ glade_gtk_app_chooser_button_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *) glade_app_chooser_button_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-app-chooser-widget.c b/plugins/gtk+/glade-gtk-app-chooser-widget.c
index aaf3ac7f..5e476612 100644
--- a/plugins/gtk+/glade-gtk-app-chooser-widget.c
+++ b/plugins/gtk+/glade-gtk-app-chooser-widget.c
@@ -36,5 +36,5 @@ glade_gtk_app_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *) glade_app_chooser_widget_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-arrow.c b/plugins/gtk+/glade-gtk-arrow.c
index 042fc809..6652f86a 100644
--- a/plugins/gtk+/glade-gtk-arrow.c
+++ b/plugins/gtk+/glade-gtk-arrow.c
@@ -36,7 +36,7 @@ glade_gtk_arrow_create_editable (GladeWidgetAdaptor * adaptor,
   if (type == GLADE_PAGE_GENERAL)
     editable = (GladeEditable *) glade_arrow_editor_new ();
   else
-    editable = GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+    editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 
   return editable;
 }
diff --git a/plugins/gtk+/glade-gtk-assistant.c b/plugins/gtk+/glade-gtk-assistant.c
index 3c614c4f..7500e094 100644
--- a/plugins/gtk+/glade-gtk-assistant.c
+++ b/plugins/gtk+/glade-gtk-assistant.c
@@ -143,8 +143,8 @@ glade_gtk_assistant_get_children (GladeWidgetAdaptor *adaptor,
   GList *children = NULL, *parent_children;
 
   /* Chain up */
-  if (GWA_GET_CLASS (GTK_TYPE_WINDOW)->get_children)
-    parent_children = GWA_GET_CLASS (GTK_TYPE_WINDOW)->get_children (adaptor, container);
+  if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->get_children)
+    parent_children = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->get_children (adaptor, container);
   else
     parent_children = NULL;
   
@@ -285,9 +285,9 @@ glade_gtk_assistant_verify_property (GladeWidgetAdaptor *adaptor,
         gtk_assistant_get_n_pages (GTK_ASSISTANT (object));
 
   /* Chain Up */
-  if (GWA_GET_CLASS (GTK_TYPE_WINDOW)->verify_property == NULL)
+  if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->verify_property == NULL)
     return TRUE;
-  return GWA_GET_CLASS (GTK_TYPE_WINDOW)->verify_property (adaptor,
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->verify_property (adaptor,
                                                            object,
                                                            property_name,
                                                            value);
@@ -316,7 +316,7 @@ glade_gtk_assistant_set_property (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor,
                                                  object, property_name, value);
 }
 
@@ -334,7 +334,7 @@ glade_gtk_assistant_get_property (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_WINDOW)->get_property (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->get_property (adaptor,
                                                  object, property_name, value);
 }
 
@@ -375,7 +375,7 @@ glade_gtk_assistant_set_child_property (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_WINDOW)->child_set_property (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->child_set_property (adaptor,
                                                        container,
                                                        child,
                                                        property_name, value);
@@ -399,7 +399,7 @@ glade_gtk_assistant_get_child_property (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_WINDOW)->child_get_property (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->child_get_property (adaptor,
                                                        container,
                                                        child,
                                                        property_name, value);
diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c
index 1153c957..cd3a3f0c 100644
--- a/plugins/gtk+/glade-gtk-box.c
+++ b/plugins/gtk+/glade-gtk-box.c
@@ -53,7 +53,7 @@ glade_gtk_box_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_box_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static void
@@ -140,7 +140,7 @@ glade_gtk_box_get_children (GladeWidgetAdaptor *adaptor, GObject *container)
 {
   GList *children;
 
-  children = GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
+  children = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
 
   return g_list_sort_with_data (children, (GCompareDataFunc) sort_box_children, container);
 }
@@ -239,7 +239,7 @@ glade_gtk_box_set_child_property (GladeWidgetAdaptor *adaptor,
 
   /* Chain Up */
   if (!is_position)
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container,
                                                   child, property_name, value);
@@ -276,7 +276,7 @@ glade_gtk_box_get_property (GladeWidgetAdaptor *adaptor,
       g_value_set_int (value, glade_gtk_box_get_num_children (object));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id,
                                                       value);
 }
 
@@ -402,7 +402,7 @@ glade_gtk_box_set_property (GladeWidgetAdaptor *adaptor,
   else if (!strcmp (id, "size"))
     glade_gtk_box_set_size (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
                                                       value);
 }
 
@@ -442,8 +442,8 @@ glade_gtk_box_verify_property (GladeWidgetAdaptor *adaptor,
 {
   if (!strcmp (id, "size"))
     return glade_gtk_box_verify_size (object, value);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
                                                                 id, value);
 
   return TRUE;
@@ -597,7 +597,7 @@ glade_gtk_box_replace_child (GladeWidgetAdaptor *adaptor,
 
   g_object_ref (G_OBJECT (current));
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                                      container,
                                                      current, new_widget);
   gbox = glade_widget_get_from_gobject (container);
@@ -636,7 +636,7 @@ glade_gtk_box_child_action_activate (GladeWidgetAdaptor *adaptor,
                                                          object, TRUE, FALSE);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                container,
                                                                object,
                                                                action_path);
diff --git a/plugins/gtk+/glade-gtk-button.c b/plugins/gtk+/glade-gtk-button.c
index 7d45881b..f3d9b6a5 100644
--- a/plugins/gtk+/glade-gtk-button.c
+++ b/plugins/gtk+/glade-gtk-button.c
@@ -113,7 +113,7 @@ glade_gtk_color_button_set_property (GladeWidgetAdaptor *adaptor,
                                     (GdkRGBA *) g_value_get_boxed (value));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_BUTTON)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_BUTTON)->set_property (adaptor, object, id, value);
 }
 
 /* ----------------------------- GtkButton ------------------------------ */
@@ -133,7 +133,7 @@ glade_gtk_button_create_editable (GladeWidgetAdaptor *adaptor,
         return (GladeEditable *) glade_button_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static void
@@ -234,12 +234,12 @@ glade_gtk_button_set_property (GladeWidgetAdaptor *adaptor,
       /* I guess its my bug in GTK+, we need to resync the appearance property
        * on GtkButton when the GtkButton:use-stock property changes.
        */
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
                                                         id, value);
       glade_gtk_sync_use_appearance (widget);
     }
   else if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 
   /* GtkLockButton hides itself after setting a property so we need to make sure
    * we keep it visible.
@@ -260,7 +260,7 @@ glade_gtk_button_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->read_widget (adaptor, widget, node);
 
   glade_gtk_button_update_stock (widget);
 
@@ -320,7 +320,7 @@ glade_gtk_button_write_widget (GladeWidgetAdaptor *adaptor,
     }
 
   /* Write out other normal properties and any other class derived custom properties after ... */
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context,
                                                     node);
 
 }
@@ -337,7 +337,7 @@ glade_gtk_button_create_eprop (GladeWidgetAdaptor *adaptor,
       eprop = glade_eprop_enum_int_new (def, GTK_TYPE_RESPONSE_TYPE, use_command);
     }
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_WIDGET)->create_eprop (adaptor, def, use_command);
 
   return eprop;
diff --git a/plugins/gtk+/glade-gtk-cell-layout.c b/plugins/gtk+/glade-gtk-cell-layout.c
index 80469a2a..12cddcb5 100644
--- a/plugins/gtk+/glade-gtk-cell-layout.c
+++ b/plugins/gtk+/glade-gtk-cell-layout.c
@@ -138,7 +138,7 @@ glade_gtk_cell_layout_get_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -160,7 +160,7 @@ glade_gtk_cell_layout_set_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -473,7 +473,7 @@ glade_gtk_cell_layout_action_activate (GladeWidgetAdaptor *adaptor,
   if (strcmp (action_path, "launch_editor") == 0)
     glade_gtk_cell_layout_launch_editor_action (object);
   else
-    GWA_GET_CLASS (G_TYPE_OBJECT)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->action_activate (adaptor,
                                                     object, action_path);
 }
 
@@ -485,7 +485,7 @@ glade_gtk_cell_layout_action_activate_as_widget (GladeWidgetAdaptor *adaptor,
   if (strcmp (action_path, "launch_editor") == 0)
     glade_gtk_cell_layout_launch_editor_action (object);
   else
-    GWA_GET_CLASS (GTK_TYPE_WIDGET)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->action_activate (adaptor,
                                                       object, action_path);
 }
 
diff --git a/plugins/gtk+/glade-gtk-cell-renderer.c b/plugins/gtk+/glade-gtk-cell-renderer.c
index ee0ffdff..a8777372 100644
--- a/plugins/gtk+/glade-gtk-cell-renderer.c
+++ b/plugins/gtk+/glade-gtk-cell-renderer.c
@@ -52,7 +52,7 @@ glade_gtk_cell_renderer_action_activate (GladeWidgetAdaptor *adaptor,
         }
     }
   else
-    GWA_GET_CLASS (G_TYPE_OBJECT)->action_activate (adaptor, object, action_path);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->action_activate (adaptor, object, action_path);
 }
 
 void
@@ -93,7 +93,7 @@ glade_gtk_cell_renderer_create_eprop (GladeWidgetAdaptor *adaptor,
                           "property-def", def,
                           "use-command", use_command, NULL);
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->create_eprop (adaptor, def, use_command);
   return eprop;
 }
@@ -106,7 +106,7 @@ glade_gtk_cell_renderer_create_editable (GladeWidgetAdaptor *adaptor,
   GladeEditable *editable;
 
   /* Get base editable */
-  editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
+  editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
 
   if (type == GLADE_PAGE_GENERAL || type == GLADE_PAGE_COMMON)
     return (GladeEditable *) glade_cell_renderer_editor_new (adaptor, type,
@@ -202,7 +202,7 @@ glade_gtk_cell_renderer_set_property (GladeWidgetAdaptor *adaptor,
     glade_gtk_cell_renderer_sync_attributes (object);
   else if (glade_gtk_cell_renderer_property_enabled (object, property_name))
     /* Chain Up */
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor,
                                                  object, property_name, value);
 }
 
@@ -265,7 +265,7 @@ glade_gtk_cell_renderer_write_widget (GladeWidgetAdaptor *adaptor,
    */
   glade_gtk_cell_renderer_write_properties (widget, context, node);
 
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 }
 
 static void
@@ -319,7 +319,7 @@ glade_gtk_cell_renderer_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the properties... */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   g_signal_connect (glade_widget_get_project (widget), "parse-finished",
                     G_CALLBACK (glade_gtk_cell_renderer_parse_finished),
diff --git a/plugins/gtk+/glade-gtk-combo-box-text.c b/plugins/gtk+/glade-gtk-combo-box-text.c
index 99548462..651b1239 100644
--- a/plugins/gtk+/glade-gtk-combo-box-text.c
+++ b/plugins/gtk+/glade-gtk-combo-box-text.c
@@ -40,7 +40,7 @@ glade_gtk_combo_box_text_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *) glade_combo_box_text_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 void
@@ -51,7 +51,7 @@ glade_gtk_combo_box_text_post_create (GladeWidgetAdaptor *adaptor,
   GladeWidget *gwidget;
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->post_create (adaptor, object, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_COMBO_BOX)->post_create (adaptor, object, reason);
 
   /* No editor, no model, no cells on a GtkComboBoxText, just the items. */
   gwidget = glade_widget_get_from_gobject (object);
@@ -73,7 +73,7 @@ glade_gtk_combo_box_text_create_eprop (GladeWidgetAdaptor *adaptor,
       eprop = glade_eprop_string_list_new (def, use_command, TRUE, TRUE);
     }
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_WIDGET)->create_eprop (adaptor, def, use_command);
 
   return eprop;
@@ -95,7 +95,7 @@ glade_gtk_combo_box_text_string_from_value (GladeWidgetAdaptor *adaptor,
       return glade_string_list_to_string (list);
     }
   else
-    return GWA_GET_CLASS
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_COMBO_BOX)->string_from_value (adaptor, def, value);
 }
 
@@ -129,7 +129,7 @@ glade_gtk_combo_box_text_set_property (GladeWidgetAdaptor *adaptor,
                                 CLAMP (active, 0, g_list_length (string_list) - 1));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_COMBO_BOX)->set_property (adaptor, object, id, value);
 }
 
 static void
@@ -186,7 +186,7 @@ glade_gtk_combo_box_text_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_COMBO_BOX)->read_widget (adaptor, widget, node);
 
   glade_gtk_combo_box_text_read_items (widget, node);
 }
@@ -247,7 +247,7 @@ glade_gtk_combo_box_text_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_COMBO_BOX)->write_widget (adaptor, widget, context, node);
 
   attrs_node = glade_xml_node_new (context, GLADE_TAG_ITEMS);
 
diff --git a/plugins/gtk+/glade-gtk-combo-box.c b/plugins/gtk+/glade-gtk-combo-box.c
index 7006be16..6edebde2 100644
--- a/plugins/gtk+/glade-gtk-combo-box.c
+++ b/plugins/gtk+/glade-gtk-combo-box.c
@@ -39,7 +39,7 @@ glade_gtk_combo_box_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *) glade_combo_box_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 void
@@ -50,7 +50,7 @@ glade_gtk_combo_box_post_create (GladeWidgetAdaptor *adaptor,
   GladeWidget *widget;
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor, object, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor, object, reason);
 
   widget = glade_widget_get_from_gobject (object);
   if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (object)))
@@ -75,7 +75,7 @@ glade_gtk_combo_box_set_property (GladeWidgetAdaptor *adaptor,
     {
       /* Avoid warnings */
       if (g_value_get_int (value) >= 0)
-        GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
+        GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
                                                           object, id, value);
     }
   else if (!strcmp (id, "text-column"))
@@ -95,7 +95,7 @@ glade_gtk_combo_box_set_property (GladeWidgetAdaptor *adaptor,
                                              _("Tearoff menus are disabled"));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
                                                       object, id, value);
 }
 
diff --git a/plugins/gtk+/glade-gtk-container.c b/plugins/gtk+/glade-gtk-container.c
index a791ed12..fc36b3a2 100644
--- a/plugins/gtk+/glade-gtk-container.c
+++ b/plugins/gtk+/glade-gtk-container.c
@@ -81,7 +81,7 @@ glade_gtk_container_add_verify (GladeWidgetAdaptor *adaptor,
 
       return FALSE;
     }
-  else if (GWA_USE_PLACEHOLDERS (adaptor) &&
+  else if (GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (adaptor) &&
            glade_util_count_placeholders (gwidget) == 0)
     {
       if (user_feedback)
@@ -224,8 +224,8 @@ glade_gtk_container_get_children (GladeWidgetAdaptor *adaptor,
   children = glade_util_container_get_all_children (GTK_CONTAINER (container));
   
   /* Chain up */
-  if (GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_children)
-    parent_children = GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_children (adaptor, container);
+  if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->get_children)
+    parent_children = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->get_children (adaptor, container);
   else
     parent_children = NULL;
   
@@ -237,5 +237,5 @@ GladeEditable *
 glade_gtk_container_create_editable (GladeWidgetAdaptor *adaptor,
                                      GladeEditorPageType type)
 {
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-dialog.c b/plugins/gtk+/glade-gtk-dialog.c
index dc934014..f9914690 100644
--- a/plugins/gtk+/glade-gtk-dialog.c
+++ b/plugins/gtk+/glade-gtk-dialog.c
@@ -71,7 +71,7 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
   GtkDialog *dialog;
 
   /* Chain Up first */
-  GWA_GET_CLASS (GTK_TYPE_WINDOW)->post_create (adaptor, object, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WINDOW)->post_create (adaptor, object, reason);
 
   g_return_if_fail (GTK_IS_DIALOG (object));
 
@@ -162,7 +162,7 @@ void
 glade_gtk_dialog_read_child (GladeWidgetAdaptor * adaptor,
                              GladeWidget * widget, GladeXmlNode * node)
 {
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
 
   node = glade_xml_node_get_parent (node);
 
@@ -185,7 +185,7 @@ glade_gtk_dialog_write_child (GladeWidgetAdaptor * adaptor,
    */
   glade_gtk_action_widgets_ensure_names (parent, "action_area");
   
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
 
   if (parent && GTK_IS_DIALOG (glade_widget_get_object (parent)))
     glade_gtk_action_widgets_write_child (parent, context, node, "action_area");
diff --git a/plugins/gtk+/glade-gtk-entry-buffer.c b/plugins/gtk+/glade-gtk-entry-buffer.c
index d5c09dc5..3e32983f 100644
--- a/plugins/gtk+/glade-gtk-entry-buffer.c
+++ b/plugins/gtk+/glade-gtk-entry-buffer.c
@@ -85,5 +85,5 @@ glade_gtk_entry_buffer_set_property (GladeWidgetAdaptor * adaptor,
     }
   else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-entry.c b/plugins/gtk+/glade-gtk-entry.c
index 348e1d0e..cb860d7c 100644
--- a/plugins/gtk+/glade-gtk-entry.c
+++ b/plugins/gtk+/glade-gtk-entry.c
@@ -72,7 +72,7 @@ glade_gtk_entry_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_entry_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 }
 
 void
@@ -165,7 +165,7 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor *adaptor,
       /* Avoid a silly crash in GTK+ */
       if (gtk_entry_get_icon_storage_type (GTK_ENTRY (object),
                                            GTK_ENTRY_ICON_PRIMARY) != GTK_IMAGE_EMPTY)
-        GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+        GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
     }
   else if (!strcmp (id, "secondary-icon-tooltip-text") ||
            !strcmp (id, "secondary-icon-tooltip-markup"))
@@ -173,7 +173,7 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor *adaptor,
       /* Avoid a silly crash in GTK+ */
       if (gtk_entry_get_icon_storage_type (GTK_ENTRY (object),
                                            GTK_ENTRY_ICON_SECONDARY) != GTK_IMAGE_EMPTY)
-        GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+        GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
     }
   else if (!strcmp (id, "text"))
     {
@@ -197,7 +197,7 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor *adaptor,
                                              _("This property is only available\n"
                                                "if the entry has a frame"));
 
-      GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
     }
   else if (!strcmp (id, "visibility"))
     {
@@ -208,11 +208,11 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor *adaptor,
       else
         glade_widget_property_set_sensitive (gwidget, "invisible-char", TRUE, NULL);
 
-      GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
     }
   else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
 }
 
 void
@@ -227,7 +227,7 @@ glade_gtk_entry_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
 
   if (!glade_widget_property_original_default (widget, "text"))
     {
diff --git a/plugins/gtk+/glade-gtk-expander.c b/plugins/gtk+/glade-gtk-expander.c
index b1cfb89d..ab2dd2d7 100644
--- a/plugins/gtk+/glade-gtk-expander.c
+++ b/plugins/gtk+/glade-gtk-expander.c
@@ -87,7 +87,7 @@ glade_gtk_expander_replace_child (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
       (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                            G_OBJECT (container),
                                            G_OBJECT (current),
@@ -115,7 +115,7 @@ glade_gtk_expander_add_child (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, object, child);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, object, child);
 }
 
 void
@@ -146,10 +146,10 @@ glade_gtk_expander_write_child (GladeWidgetAdaptor *adaptor,
 {
 
   if (!glade_gtk_write_special_child_label_item (adaptor, widget, context, node,
-                                                 GWA_GET_CLASS (GTK_TYPE_CONTAINER)->
+                                                 GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->
                                                  write_child))
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
 }
 
diff --git a/plugins/gtk+/glade-gtk-file-chooser-widget.c b/plugins/gtk+/glade-gtk-file-chooser-widget.c
index 01ce9fde..417672cd 100644
--- a/plugins/gtk+/glade-gtk-file-chooser-widget.c
+++ b/plugins/gtk+/glade-gtk-file-chooser-widget.c
@@ -45,7 +45,7 @@ glade_gtk_file_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_file_chooser_widget_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 }
 
 
@@ -63,7 +63,7 @@ glade_gtk_file_chooser_button_set_property (GladeWidgetAdaptor *adaptor,
         return;
     }
 
-  GWA_GET_CLASS (GTK_TYPE_BOX)->set_property (adaptor, object, id, value);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_BOX)->set_property (adaptor, object, id, value);
 }
 
 
@@ -74,5 +74,5 @@ glade_gtk_file_chooser_button_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_file_chooser_button_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-fixed-layout.c b/plugins/gtk+/glade-gtk-fixed-layout.c
index cf289229..59e6769f 100644
--- a/plugins/gtk+/glade-gtk-fixed-layout.c
+++ b/plugins/gtk+/glade-gtk-fixed-layout.c
@@ -36,7 +36,7 @@ glade_gtk_layout_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_layout_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static void
diff --git a/plugins/gtk+/glade-gtk-flow-box.c b/plugins/gtk+/glade-gtk-flow-box.c
index dfa5256f..c637f109 100644
--- a/plugins/gtk+/glade-gtk-flow-box.c
+++ b/plugins/gtk+/glade-gtk-flow-box.c
@@ -101,7 +101,7 @@ glade_gtk_flowbox_get_child_property (GladeWidgetAdaptor *adaptor,
   else
     {
       /* Chain Up */
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                               container,
                                                               child,
                                                               property_name,
@@ -133,7 +133,7 @@ glade_gtk_flowbox_set_child_property (GladeWidgetAdaptor *adaptor,
   else
     {
       /* Chain Up */
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                               container,
                                                               child,
                                                               property_name,
@@ -232,7 +232,7 @@ glade_gtk_flowbox_action_activate (GladeWidgetAdaptor *adaptor,
       glade_project_selection_set (project, object, TRUE);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 }
 
@@ -254,7 +254,7 @@ glade_gtk_flowbox_child_action_activate (GladeWidgetAdaptor *adaptor,
     }
   else
     {
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                  container,
                                                                  object,
                                                                  action_path);
diff --git a/plugins/gtk+/glade-gtk-font-chooser-widget.c b/plugins/gtk+/glade-gtk-font-chooser-widget.c
index b145455f..e2744175 100644
--- a/plugins/gtk+/glade-gtk-font-chooser-widget.c
+++ b/plugins/gtk+/glade-gtk-font-chooser-widget.c
@@ -36,5 +36,5 @@ glade_gtk_font_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *) glade_font_chooser_widget_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-frame.c b/plugins/gtk+/glade-gtk-frame.c
index 1f314a03..016a984d 100644
--- a/plugins/gtk+/glade-gtk-frame.c
+++ b/plugins/gtk+/glade-gtk-frame.c
@@ -78,7 +78,7 @@ glade_gtk_frame_post_create (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor, frame, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor, frame, reason);
 }
 
 void
@@ -101,7 +101,7 @@ glade_gtk_frame_replace_child (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
       (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                            G_OBJECT (container),
                                            G_OBJECT (current),
@@ -173,9 +173,9 @@ glade_gtk_frame_write_child (GladeWidgetAdaptor *adaptor,
 {
 
   if (!glade_gtk_write_special_child_label_item (adaptor, widget, context, node,
-                                                 GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child))
+                                                 GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->write_child))
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
 }
 
diff --git a/plugins/gtk+/glade-gtk-grid.c b/plugins/gtk+/glade-gtk-grid.c
index 1b2a1288..01a75021 100644
--- a/plugins/gtk+/glade-gtk-grid.c
+++ b/plugins/gtk+/glade-gtk-grid.c
@@ -63,7 +63,7 @@ glade_gtk_grid_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_grid_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static void
@@ -307,7 +307,7 @@ glade_gtk_grid_replace_child (GladeWidgetAdaptor *adaptor,
   g_return_if_fail (GTK_IS_WIDGET (new_widget));
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                                      container,
                                                      current,
                                                      new_widget);
@@ -363,7 +363,7 @@ glade_gtk_grid_set_property (GladeWidgetAdaptor *adaptor,
   else if (!strcmp (id, "n-columns"))
     glade_gtk_grid_set_n_common (object, value, FALSE);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
                                                       id, value);
 }
 
@@ -398,8 +398,8 @@ glade_gtk_grid_verify_property (GladeWidgetAdaptor  *adaptor,
     return glade_gtk_grid_verify_n_common (object, value, TRUE);
   else if (!strcmp (id, "n-columns"))
     return glade_gtk_grid_verify_n_common (object, value, FALSE);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
                                                          id, value);
 
   return TRUE;
@@ -416,7 +416,7 @@ glade_gtk_grid_set_child_property (GladeWidgetAdaptor *adaptor,
   g_return_if_fail (GTK_IS_WIDGET (child));
   g_return_if_fail (property_name != NULL && value != NULL);
 
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
     (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                               container, child,
                                               property_name, value);
@@ -471,8 +471,8 @@ glade_gtk_grid_child_verify_property (GladeWidgetAdaptor *adaptor,
     return glade_gtk_grid_verify_attach_common (child, value, "height", "n-rows");
   else if (!strcmp (id, "height"))
     return glade_gtk_grid_verify_attach_common (child, value, "top-attach", "n-rows");
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_verify_property)
-    GWA_GET_CLASS
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_verify_property)
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
     (GTK_TYPE_CONTAINER)->child_verify_property (adaptor,
                                                  container, child,
                                                  id, value);
@@ -659,7 +659,7 @@ glade_gtk_grid_child_action_activate (GladeWidgetAdaptor *adaptor,
                                                  "height", TRUE, FALSE);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                container,
                                                                object,
                                                                action_path);
diff --git a/plugins/gtk+/glade-gtk-header-bar.c b/plugins/gtk+/glade-gtk-header-bar.c
index 8ae13b4f..0d6f5251 100644
--- a/plugins/gtk+/glade-gtk-header-bar.c
+++ b/plugins/gtk+/glade-gtk-header-bar.c
@@ -119,7 +119,7 @@ glade_gtk_header_bar_action_activate (GladeWidgetAdaptor *adaptor,
       glade_command_pop_group ();
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor, object, action_path);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor, object, action_path);
 }
 
 void
@@ -155,7 +155,7 @@ glade_gtk_header_bar_child_action_activate (GladeWidgetAdaptor *adaptor,
       glade_command_pop_group ();
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                container,
                                                                object,
                                                                action_path);
@@ -178,7 +178,7 @@ glade_gtk_header_bar_get_property (GladeWidgetAdaptor *adaptor,
       g_value_set_int (value, glade_gtk_header_bar_get_num_children (object));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
 }
 
 static void
@@ -307,7 +307,7 @@ glade_gtk_header_bar_set_property (GladeWidgetAdaptor *adaptor,
   else if (!strcmp (id, "size"))
     glade_gtk_header_bar_set_size (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
 void
@@ -335,7 +335,7 @@ glade_gtk_header_bar_add_child (GladeWidgetAdaptor *adaptor,
       return;
     }
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, parent, child);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, parent, child);
   
   gbox = glade_widget_get_from_gobject (parent);
   if (!glade_widget_superuser ())
@@ -410,7 +410,7 @@ glade_gtk_header_bar_replace_child (GladeWidgetAdaptor *adaptor,
   else
     g_object_set_data (G_OBJECT (new_widget), "special-child-type", NULL);
 
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
       (GTK_TYPE_CONTAINER)->replace_child (adaptor, container, current, new_widget);
 
   gbox = glade_widget_get_from_gobject (container);
@@ -429,8 +429,8 @@ glade_gtk_header_bar_verify_property (GladeWidgetAdaptor *adaptor,
 {
   if (!strcmp (id, "size"))
     return glade_gtk_header_bar_verify_size (object, value);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object, id, value);
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object, id, value);
 
   return TRUE;
 }
@@ -477,7 +477,7 @@ glade_gtk_header_bar_get_children (GladeWidgetAdaptor *adaptor,
 {
   GList *children;
 
-  children = GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
+  children = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
   return g_list_sort_with_data (children, (GCompareDataFunc) sort_children, container);
 }
 
@@ -578,7 +578,7 @@ glade_gtk_header_bar_child_set_property (GladeWidgetAdaptor *adaptor,
 
   /* Chain Up */
   if (!is_position)
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container,
                                                   child, property_name, value);
@@ -592,5 +592,5 @@ glade_gtk_header_bar_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_header_bar_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-icon-factory.c b/plugins/gtk+/glade-gtk-icon-factory.c
index 6b54f074..df6997c6 100644
--- a/plugins/gtk+/glade-gtk-icon-factory.c
+++ b/plugins/gtk+/glade-gtk-icon-factory.c
@@ -55,7 +55,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_icon_factory_remove_default (GTK_ICON_FACTORY (object));
 G_GNUC_END_IGNORE_DEPRECATIONS
 
-  GWA_GET_CLASS (G_TYPE_OBJECT)->destroy_object (adaptor, object);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->destroy_object (adaptor, object);
 }
 
 static void
@@ -202,7 +202,7 @@ glade_gtk_icon_factory_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in any normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   glade_gtk_icon_factory_read_sources (widget, node);
 }
@@ -319,7 +319,7 @@ glade_gtk_icon_factory_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and write all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 
   glade_gtk_icon_factory_write_sources (widget, context, node);
 }
@@ -366,7 +366,7 @@ glade_gtk_icon_factory_set_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor,
                                                  object, property_name, value);
 }
 
@@ -447,7 +447,7 @@ glade_gtk_icon_factory_string_from_value (GladeWidgetAdaptor *adaptor,
       return g_string_free (string, FALSE);
     }
   else
-    return GWA_GET_CLASS
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->string_from_value (adaptor, def, value);
 }
 
@@ -467,7 +467,7 @@ glade_gtk_icon_factory_create_eprop (GladeWidgetAdaptor *adaptor,
                           "property-def", def,
                           "use-command", use_command, NULL);
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->create_eprop (adaptor, def, use_command);
   return eprop;
 }
@@ -479,7 +479,7 @@ glade_gtk_icon_factory_create_editable (GladeWidgetAdaptor *adaptor,
   GladeEditable *editable;
 
   /* Get base editable */
-  editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
+  editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
 
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_icon_factory_editor_new (adaptor, editable);
diff --git a/plugins/gtk+/glade-gtk-icon-view.c b/plugins/gtk+/glade-gtk-icon-view.c
index 5d58574b..c0280ccb 100644
--- a/plugins/gtk+/glade-gtk-icon-view.c
+++ b/plugins/gtk+/glade-gtk-icon-view.c
@@ -36,5 +36,5 @@ glade_gtk_icon_view_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_icon_view_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-image-menu-item.c b/plugins/gtk+/glade-gtk-image-menu-item.c
index 186f197a..eddcee9a 100644
--- a/plugins/gtk+/glade-gtk-image-menu-item.c
+++ b/plugins/gtk+/glade-gtk-image-menu-item.c
@@ -130,11 +130,11 @@ glade_gtk_image_menu_item_set_property (GladeWidgetAdaptor *adaptor,
   else if (!strcmp (id, "label"))
     {
       if (!glade_gtk_image_menu_item_set_label (object, value))
-        GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
+        GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
                                                           id, value);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
                                                       id, value);
 }
 
@@ -164,7 +164,7 @@ glade_gtk_image_menu_item_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU_ITEM)->read_widget (adaptor, widget, node);
 
   glade_widget_property_get (widget, "use-stock", &use_stock);
   if (use_stock)
@@ -217,7 +217,7 @@ glade_gtk_image_menu_item_write_widget (GladeWidgetAdaptor *adaptor,
   g_object_unref (G_OBJECT (label_prop));
 
   /* Chain up and write all the normal properties ... */
-  GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->write_widget (adaptor, widget, context,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU_ITEM)->write_widget (adaptor, widget, context,
                                                     node);
 
 }
@@ -234,7 +234,7 @@ glade_gtk_image_menu_item_create_editable (GladeWidgetAdaptor *adaptor,
 
   /* Get base editable */
   editable =
-      GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->create_editable (adaptor, type);
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU_ITEM)->create_editable (adaptor, type);
 
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_image_item_editor_new (adaptor, editable);
diff --git a/plugins/gtk+/glade-gtk-image.c b/plugins/gtk+/glade-gtk-image.c
index 3295ab1a..a4a7cae7 100644
--- a/plugins/gtk+/glade-gtk-image.c
+++ b/plugins/gtk+/glade-gtk-image.c
@@ -41,7 +41,7 @@ glade_gtk_image_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
 
   if (glade_widget_property_original_default (widget, "icon-name") == FALSE)
     {
@@ -80,7 +80,7 @@ glade_gtk_image_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and write all the normal properties (including "use-stock")... */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context, node);
 
   glade_gtk_write_icon_size (widget, context, node, "icon-size");
 }
@@ -147,13 +147,13 @@ glade_gtk_image_get_property (GladeWidgetAdaptor *adaptor,
       /* Make the int an enum... */
       GValue int_value = { 0, };
       g_value_init (&int_value, G_TYPE_INT);
-      GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_property (adaptor, object, id,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->get_property (adaptor, object, id,
                                                      &int_value);
       g_value_set_enum (value, g_value_get_int (&int_value));
       g_value_unset (&int_value);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->get_property (adaptor, object, id, value);
 }
 
 void
@@ -170,7 +170,7 @@ glade_gtk_image_set_property (GladeWidgetAdaptor *adaptor,
       GValue int_value = { 0, };
       g_value_init (&int_value, G_TYPE_INT);
       g_value_set_int (&int_value, g_value_get_enum (value));
-      GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id,
                                                      &int_value);
       g_value_unset (&int_value);
     }
@@ -201,7 +201,7 @@ glade_gtk_image_set_property (GladeWidgetAdaptor *adaptor,
             break;
         }
 
-      GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object,
                                                      id, value);
 
       /* Set icon size back to what it should be */
@@ -217,7 +217,7 @@ glade_gtk_image_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_image_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 }
 
 /* Shared with other classes */
diff --git a/plugins/gtk+/glade-gtk-info-bar.c b/plugins/gtk+/glade-gtk-info-bar.c
index 10a9792f..0330ca0c 100644
--- a/plugins/gtk+/glade-gtk-info-bar.c
+++ b/plugins/gtk+/glade-gtk-info-bar.c
@@ -31,7 +31,7 @@ glade_gtk_info_bar_read_child (GladeWidgetAdaptor *adaptor,
                                GladeWidget *widget,
                                GladeXmlNode *node)
 {
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
 
   node = glade_xml_node_get_parent (node);
   
@@ -56,7 +56,7 @@ glade_gtk_info_bar_write_child (GladeWidgetAdaptor *adaptor,
   if (g_strcmp0 (glade_widget_get_internal (widget), "action_area"))
     glade_gtk_action_widgets_ensure_names (parent, "action_area");
 
-  GWA_GET_CLASS (GTK_TYPE_BOX)->write_child (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_BOX)->write_child (adaptor, widget, context, node);
 
   if (g_strcmp0 (glade_widget_get_internal (widget), "action_area"))
     glade_gtk_action_widgets_write_child (parent, context, node, "action_area");
diff --git a/plugins/gtk+/glade-gtk-label.c b/plugins/gtk+/glade-gtk-label.c
index 3f5bb38f..9b127592 100644
--- a/plugins/gtk+/glade-gtk-label.c
+++ b/plugins/gtk+/glade-gtk-label.c
@@ -317,7 +317,7 @@ glade_gtk_label_set_property (GladeWidgetAdaptor *adaptor,
       if (!strcmp (id, "ellipsize"))
         glade_gtk_label_update_lines_sensitivity (object);
 
-      GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
     }
 }
 
@@ -397,7 +397,7 @@ glade_gtk_label_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
 
   glade_gtk_label_read_attributes (widget, node);
 
@@ -481,7 +481,7 @@ glade_gtk_label_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context,
                                                  node);
 
   attrs_node = glade_xml_node_new (context, GLADE_TAG_ATTRIBUTES);
@@ -524,7 +524,7 @@ glade_gtk_label_string_from_value (GladeWidgetAdaptor *adaptor,
       return str;
     }
   else
-    return GWA_GET_CLASS
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_WIDGET)->string_from_value (adaptor, def, value);
 }
 
@@ -547,7 +547,7 @@ glade_gtk_label_create_eprop (GladeWidgetAdaptor *adaptor,
                             "use-command", use_command, NULL);
     }
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_WIDGET)->create_eprop (adaptor, def, use_command);
   return eprop;
 }
@@ -561,7 +561,7 @@ glade_gtk_label_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     editable = (GladeEditable *) glade_label_editor_new ();
   else
-    editable = GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+    editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 
   return editable;
 }
diff --git a/plugins/gtk+/glade-gtk-level-bar.c b/plugins/gtk+/glade-gtk-level-bar.c
index df1fe928..174d0a32 100644
--- a/plugins/gtk+/glade-gtk-level-bar.c
+++ b/plugins/gtk+/glade-gtk-level-bar.c
@@ -36,5 +36,5 @@ glade_gtk_level_bar_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_level_bar_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-list-box.c b/plugins/gtk+/glade-gtk-list-box.c
index 109a80b3..3db4280d 100644
--- a/plugins/gtk+/glade-gtk-list-box.c
+++ b/plugins/gtk+/glade-gtk-list-box.c
@@ -108,7 +108,7 @@ glade_gtk_listbox_get_child_property (GladeWidgetAdaptor *adaptor,
   else
     {
       /* Chain Up */
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                               container,
                                                               child,
                                                               property_name,
@@ -141,7 +141,7 @@ glade_gtk_listbox_set_child_property (GladeWidgetAdaptor *adaptor,
   else
     {
       /* Chain Up */
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                               container,
                                                               child,
                                                               property_name,
@@ -203,7 +203,7 @@ glade_gtk_listbox_get_property (GladeWidgetAdaptor *adaptor,
       g_value_set_boolean (value, glade_listbox_get_placeholder (GTK_LIST_BOX (object)) != NULL);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id,
                                                       value);
 }
 
@@ -243,7 +243,7 @@ glade_gtk_listbox_set_property (GladeWidgetAdaptor *adaptor,
       gtk_list_box_set_placeholder (GTK_LIST_BOX (object), child);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
                                                       value);
 }
 
@@ -288,7 +288,7 @@ glade_gtk_listbox_replace_child (GladeWidgetAdaptor *adaptor,
       return;
     }
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                                      container,
                                                      current, new_widget);
 }
@@ -367,7 +367,7 @@ glade_gtk_listbox_action_activate (GladeWidgetAdaptor *adaptor,
       glade_project_selection_set (project, object, TRUE);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 }
 
@@ -389,7 +389,7 @@ glade_gtk_listbox_child_action_activate (GladeWidgetAdaptor *adaptor,
     }
   else
     {
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                  container,
                                                                  object,
                                                                  action_path);
diff --git a/plugins/gtk+/glade-gtk-list-store.c b/plugins/gtk+/glade-gtk-list-store.c
index bfaad360..c2107d0e 100644
--- a/plugins/gtk+/glade-gtk-list-store.c
+++ b/plugins/gtk+/glade-gtk-list-store.c
@@ -137,7 +137,7 @@ glade_gtk_store_set_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor,
                                                  object, property_name, value);
 }
 
@@ -161,7 +161,7 @@ glade_gtk_store_create_eprop (GladeWidgetAdaptor *adaptor,
                           "property-def", def,
                           "use-command", use_command, NULL);
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->create_eprop (adaptor, def, use_command);
   return eprop;
 }
@@ -236,7 +236,7 @@ glade_gtk_store_create_editable (GladeWidgetAdaptor *adaptor,
   GladeEditable *editable;
 
   /* Get base editable */
-  editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
+  editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
 
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_store_editor_new (adaptor, editable);
@@ -319,7 +319,7 @@ glade_gtk_store_string_from_value (GladeWidgetAdaptor *adaptor,
       return g_string_free (string, FALSE);
     }
   else
-    return GWA_GET_CLASS
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->string_from_value (adaptor, def, value);
 }
 
@@ -449,7 +449,7 @@ glade_gtk_store_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and write all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 
   glade_gtk_store_write_columns (widget, context, node);
   glade_gtk_store_write_data (widget, context, node);
@@ -658,7 +658,7 @@ glade_gtk_store_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   glade_gtk_store_read_columns (widget, node);
 
diff --git a/plugins/gtk+/glade-gtk-menu-item.c b/plugins/gtk+/glade-gtk-menu-item.c
index 5d627aa6..1d320f07 100644
--- a/plugins/gtk+/glade-gtk-menu-item.c
+++ b/plugins/gtk+/glade-gtk-menu-item.c
@@ -55,7 +55,7 @@ glade_gtk_menu_item_action_activate (GladeWidgetAdaptor *adaptor,
         glade_gtk_menu_shell_launch_editor (object, _("Edit Menu"));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 
   if (shell)
@@ -70,7 +70,7 @@ glade_gtk_menu_item_constructor (GType type,
   GladeWidgetAdaptor *adaptor;
   GObject *ret_obj;
 
-  ret_obj = GWA_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
+  ret_obj = GLADE_WIDGET_ADAPTOR_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
       (type, n_construct_properties, construct_properties);
 
   adaptor = GLADE_WIDGET_ADAPTOR (ret_obj);
@@ -224,7 +224,7 @@ glade_gtk_menu_item_set_property (GladeWidgetAdaptor *adaptor,
     glade_gtk_menu_item_set_label (object, value);
   else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
                                                       value);
 }
 
@@ -235,5 +235,5 @@ glade_gtk_activatable_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_activatable_editor_new (adaptor, NULL);
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-menu-shell.c b/plugins/gtk+/glade-gtk-menu-shell.c
index b86ee371..0a6a87a8 100644
--- a/plugins/gtk+/glade-gtk-menu-shell.c
+++ b/plugins/gtk+/glade-gtk-menu-shell.c
@@ -116,7 +116,7 @@ glade_gtk_menu_shell_get_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                   container,
                                                   child, property_name, value);
@@ -158,7 +158,7 @@ glade_gtk_menu_shell_set_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -177,7 +177,7 @@ glade_gtk_menu_shell_action_activate (GladeWidgetAdaptor *adaptor,
         glade_gtk_menu_shell_launch_editor (object, _("Edit Menu"));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 
   gtk_menu_shell_deactivate (GTK_MENU_SHELL (object));
diff --git a/plugins/gtk+/glade-gtk-menu.c b/plugins/gtk+/glade-gtk-menu.c
index 09a39143..8ec8e858 100644
--- a/plugins/gtk+/glade-gtk-menu.c
+++ b/plugins/gtk+/glade-gtk-menu.c
@@ -33,7 +33,7 @@ glade_gtk_menu_constructor (GType type,
   GladeWidgetAdaptor *adaptor;
   GObject *ret_obj;
 
-  ret_obj = GWA_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
+  ret_obj = GLADE_WIDGET_ADAPTOR_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
       (type, n_construct_properties, construct_properties);
 
   adaptor = GLADE_WIDGET_ADAPTOR (ret_obj);
diff --git a/plugins/gtk+/glade-gtk-message-dialog.c b/plugins/gtk+/glade-gtk-message-dialog.c
index 385947a5..131be7b2 100644
--- a/plugins/gtk+/glade-gtk-message-dialog.c
+++ b/plugins/gtk+/glade-gtk-message-dialog.c
@@ -94,7 +94,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
         }
 
       if (glade_widget_get_parent (*gimage) ||
-          GWA_IS_TOPLEVEL (glade_widget_get_adaptor (*gimage)))
+          GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (glade_widget_get_adaptor (*gimage)))
         return MD_IMAGE_ACTION_INVALID;
 
       return MD_IMAGE_ACTION_SET;
@@ -163,7 +163,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
       /* Chain up, even if property us message-type because
        * it's not fully handled here
        */
-      GWA_GET_CLASS (GTK_TYPE_DIALOG)->set_property (adaptor, object,
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_DIALOG)->set_property (adaptor, object,
                                                      id, value);
     }
 }
@@ -187,8 +187,8 @@ glade_gtk_message_dialog_verify_property (GladeWidgetAdaptor * adaptor,
 
       return retval;
     }
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
                                                                 id, value);
   else
     return TRUE;
@@ -213,6 +213,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
         g_value_set_object (value, image);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_DIALOG)->get_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_DIALOG)->get_property (adaptor, object,
                                                    property_name, value);
 }
diff --git a/plugins/gtk+/glade-gtk-model-button.c b/plugins/gtk+/glade-gtk-model-button.c
index 5aac1270..329f5119 100644
--- a/plugins/gtk+/glade-gtk-model-button.c
+++ b/plugins/gtk+/glade-gtk-model-button.c
@@ -29,7 +29,7 @@ glade_gtk_model_button_read_widget (GladeWidgetAdaptor *adaptor,
                                     GladeWidget        *widget,
                                     GladeXmlNode       *node)
 {
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->read_widget (adaptor, widget, node);
 }
 
 void
@@ -38,7 +38,7 @@ glade_gtk_model_button_write_widget (GladeWidgetAdaptor *adaptor,
                                      GladeXmlContext    *context,
                                      GladeXmlNode       *node)
 {
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context, node);
 }
 
 GladeEditable *
@@ -48,5 +48,5 @@ glade_gtk_model_button_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_model_button_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-notebook.c b/plugins/gtk+/glade-gtk-notebook.c
index ac204116..cd5de473 100644
--- a/plugins/gtk+/glade-gtk-notebook.c
+++ b/plugins/gtk+/glade-gtk-notebook.c
@@ -49,7 +49,7 @@ glade_gtk_notebook_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_notebook_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static gint
@@ -583,7 +583,7 @@ glade_gtk_notebook_set_property (GladeWidgetAdaptor *adaptor,
         gtk_notebook_set_action_widget (GTK_NOTEBOOK (object), NULL, GTK_PACK_END); 
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
                                                       id, value);
 }
 
@@ -604,7 +604,7 @@ glade_gtk_notebook_get_property (GladeWidgetAdaptor *adaptor,
       g_value_set_boolean (value, gtk_notebook_get_action_widget (GTK_NOTEBOOK (object), GTK_PACK_END) != NULL);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id,
                                                       value);
 }
 
@@ -641,8 +641,8 @@ glade_gtk_notebook_verify_property (GladeWidgetAdaptor *adaptor,
 {
   if (!strcmp (id, "pages"))
     return glade_gtk_notebook_verify_n_pages (object, value);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
                                                          id, value);
 
   return TRUE;
@@ -867,8 +867,8 @@ glade_gtk_notebook_child_verify_property (GladeWidgetAdaptor *adaptor,
     return g_value_get_int (value) >= 0 &&
         g_value_get_int (value) <
         gtk_notebook_get_n_pages (GTK_NOTEBOOK (container));
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_verify_property)
-    GWA_GET_CLASS
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_verify_property)
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_verify_property (adaptor,
                                                      container, child,
                                                      id, value);
@@ -897,7 +897,7 @@ glade_gtk_notebook_set_child_property (GladeWidgetAdaptor *adaptor,
     }
   /* packing properties are unsupported on tabs ... except "position" */
   else if (g_object_get_data (child, "special-child-type") == NULL)
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -959,7 +959,7 @@ glade_gtk_notebook_child_action_activate (GladeWidgetAdaptor *adaptor,
                                                          object, TRUE, TRUE);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                container,
                                                                object,
                                                                action_path);
diff --git a/plugins/gtk+/glade-gtk-overlay.c b/plugins/gtk+/glade-gtk-overlay.c
index 732b5e8f..4a3e51e8 100644
--- a/plugins/gtk+/glade-gtk-overlay.c
+++ b/plugins/gtk+/glade-gtk-overlay.c
@@ -170,7 +170,7 @@ glade_gtk_overlay_add_child (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, object, child);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, object, child);
 }
 
 void
diff --git a/plugins/gtk+/glade-gtk-paned.c b/plugins/gtk+/glade-gtk-paned.c
index 09bc7115..db220766 100644
--- a/plugins/gtk+/glade-gtk-paned.c
+++ b/plugins/gtk+/glade-gtk-paned.c
@@ -138,7 +138,7 @@ glade_gtk_paned_set_child_property (GladeWidgetAdaptor * adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -155,7 +155,7 @@ glade_gtk_paned_get_child_property (GladeWidgetAdaptor * adaptor,
                          gtk_paned_get_child1 (GTK_PANED (container)));
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                   container, child,
                                                   property_name, value);
diff --git a/plugins/gtk+/glade-gtk-popover-menu.c b/plugins/gtk+/glade-gtk-popover-menu.c
index 59b4fb12..b58be8bc 100644
--- a/plugins/gtk+/glade-gtk-popover-menu.c
+++ b/plugins/gtk+/glade-gtk-popover-menu.c
@@ -180,7 +180,7 @@ glade_gtk_popover_menu_post_create (GladeWidgetAdaptor *adaptor,
   g_signal_connect (container, "notify::visible-submenu",
                     G_CALLBACK (glade_gtk_popover_menu_visible_submenu_changed), NULL);
 
-  GWA_GET_CLASS (GTK_TYPE_POPOVER)->post_create (adaptor, container, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->post_create (adaptor, container, reason);
 }
 
 void
@@ -410,7 +410,7 @@ glade_gtk_popover_menu_set_property (GladeWidgetAdaptor * adaptor,
   else if (!strcmp (id, "current"))
     glade_gtk_popover_menu_set_current (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_POPOVER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->set_property (adaptor, object, id, value);
 }
 
 void
@@ -430,7 +430,7 @@ glade_gtk_popover_menu_get_property (GladeWidgetAdaptor * adaptor,
       g_value_set_int (value, get_visible_child (GTK_POPOVER_MENU (object), NULL));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_POPOVER)->get_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->get_property (adaptor, object, id, value);
 }
 
 static gboolean
@@ -468,8 +468,8 @@ glade_gtk_popover_menu_verify_property (GladeWidgetAdaptor * adaptor,
     return glade_gtk_popover_menu_verify_submenus (object, value);
   else if (!strcmp (id, "current"))
     return glade_gtk_popover_menu_verify_current (object, value);
-  else if (GWA_GET_CLASS (GTK_TYPE_POPOVER)->verify_property)
-    return GWA_GET_CLASS (GTK_TYPE_POPOVER)->verify_property (adaptor, object, id, value);
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->verify_property)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->verify_property (adaptor, object, id, value);
 
   return TRUE;
 }
@@ -537,7 +537,7 @@ glade_gtk_popover_menu_set_child_property (GladeWidgetAdaptor * adaptor,
     gtk_container_child_set_property (GTK_CONTAINER (container),
                                       GTK_WIDGET (child), id, value);
   else    
-    GWA_GET_CLASS (GTK_TYPE_POPOVER)->child_set_property (adaptor, container, child, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->child_set_property (adaptor, container, child, id, value);
 }
 
 void
@@ -558,6 +558,6 @@ glade_gtk_popover_menu_create_editable (GladeWidgetAdaptor * adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_popover_menu_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_POPOVER)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_POPOVER)->create_editable (adaptor, type);
 }
 
diff --git a/plugins/gtk+/glade-gtk-popover.c b/plugins/gtk+/glade-gtk-popover.c
index 2e9fe239..07ed8614 100644
--- a/plugins/gtk+/glade-gtk-popover.c
+++ b/plugins/gtk+/glade-gtk-popover.c
@@ -35,7 +35,7 @@ glade_gtk_popover_constructor (GType type,
   GladeWidgetAdaptor *adaptor;
   GObject *ret_obj;
 
-  ret_obj = GWA_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
+  ret_obj = GLADE_WIDGET_ADAPTOR_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
       (type, n_construct_properties, construct_properties);
 
   adaptor = GLADE_WIDGET_ADAPTOR (ret_obj);
@@ -53,7 +53,7 @@ glade_gtk_popover_create_editable (GladeWidgetAdaptor * adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_popover_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static gint
@@ -78,5 +78,5 @@ glade_gtk_popover_post_create (GladeWidgetAdaptor *adaptor,
   gtk_popover_set_modal (GTK_POPOVER (popover), FALSE);
   gtk_popover_set_relative_to (GTK_POPOVER (popover), NULL);
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor, popover, reason);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor, popover, reason);
 }
diff --git a/plugins/gtk+/glade-gtk-progress-bar.c b/plugins/gtk+/glade-gtk-progress-bar.c
index b2ecbd20..654f23da 100644
--- a/plugins/gtk+/glade-gtk-progress-bar.c
+++ b/plugins/gtk+/glade-gtk-progress-bar.c
@@ -38,7 +38,7 @@ glade_gtk_progress_bar_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_progress_bar_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 void
@@ -65,5 +65,5 @@ glade_gtk_progress_bar_set_property (GladeWidgetAdaptor *adaptor,
     }
 
   if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-radio-button.c b/plugins/gtk+/glade-gtk-radio-button.c
index 22747861..95688523 100644
--- a/plugins/gtk+/glade-gtk-radio-button.c
+++ b/plugins/gtk+/glade-gtk-radio-button.c
@@ -44,7 +44,7 @@ glade_gtk_radio_button_set_property (GladeWidgetAdaptor * adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS (GTK_TYPE_CHECK_BUTTON)->set_property (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CHECK_BUTTON)->set_property (adaptor,
                                                        object,
                                                        property_name, value);
 }
diff --git a/plugins/gtk+/glade-gtk-radio-menu-item.c b/plugins/gtk+/glade-gtk-radio-menu-item.c
index d50def09..c5ef113d 100644
--- a/plugins/gtk+/glade-gtk-radio-menu-item.c
+++ b/plugins/gtk+/glade-gtk-radio-menu-item.c
@@ -50,6 +50,6 @@ glade_gtk_radio_menu_item_set_property (GladeWidgetAdaptor * adaptor,
   if (!strcmp (id, "group"))
     glade_gtk_radio_menu_item_set_group (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
                                                       id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-recent-chooser-menu.c b/plugins/gtk+/glade-gtk-recent-chooser-menu.c
index a4ed7d79..f91a0c88 100644
--- a/plugins/gtk+/glade-gtk-recent-chooser-menu.c
+++ b/plugins/gtk+/glade-gtk-recent-chooser-menu.c
@@ -34,7 +34,7 @@ glade_gtk_recent_chooser_menu_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_recent_chooser_menu_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_MENU)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU)->create_editable (adaptor, type);
 }
 
 void
@@ -47,5 +47,5 @@ glade_gtk_recent_chooser_menu_set_property (GladeWidgetAdaptor *adaptor,
   GladeProperty *property = glade_widget_get_property (widget, id);
 
   if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_MENU)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_MENU)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-recent-chooser-widget.c b/plugins/gtk+/glade-gtk-recent-chooser-widget.c
index bc25394f..cb6b7c43 100644
--- a/plugins/gtk+/glade-gtk-recent-chooser-widget.c
+++ b/plugins/gtk+/glade-gtk-recent-chooser-widget.c
@@ -35,6 +35,6 @@ glade_gtk_recent_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_recent_chooser_widget_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 }
 
diff --git a/plugins/gtk+/glade-gtk-recent-file-filter.c b/plugins/gtk+/glade-gtk-recent-file-filter.c
index 417272c7..f1fedb01 100644
--- a/plugins/gtk+/glade-gtk-recent-file-filter.c
+++ b/plugins/gtk+/glade-gtk-recent-file-filter.c
@@ -146,7 +146,7 @@ glade_gtk_recent_file_filter_create_eprop (GladeWidgetAdaptor *adaptor,
       eprop = glade_eprop_string_list_new (def, use_command, FALSE, FALSE);
     }
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->create_eprop (adaptor, def, use_command);
 
   return eprop;
@@ -168,7 +168,7 @@ glade_gtk_recent_file_filter_string_from_value (GladeWidgetAdaptor *adaptor,
       return glade_string_list_to_string (list);
     }
   else
-    return GWA_GET_CLASS
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->string_from_value (adaptor, def, value);
 }
 
@@ -182,7 +182,7 @@ glade_gtk_recent_filter_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   glade_gtk_filter_read_strings (widget, node, FILTER_MIME, "glade-mime-types");
   glade_gtk_filter_read_strings (widget, node, FILTER_PATTERN, "glade-patterns");
@@ -202,7 +202,7 @@ glade_gtk_recent_filter_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 
   strings_node = glade_xml_node_new (context, GLADE_TAG_MIME_TYPES);
   glade_gtk_filter_write_strings (widget, context, strings_node, FILTER_MIME, "glade-mime-types");
@@ -241,7 +241,7 @@ glade_gtk_file_filter_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   glade_gtk_filter_read_strings (widget, node, FILTER_MIME, "glade-mime-types");
   glade_gtk_filter_read_strings (widget, node, FILTER_PATTERN, "glade-patterns");
@@ -260,7 +260,7 @@ glade_gtk_file_filter_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 
   strings_node = glade_xml_node_new (context, GLADE_TAG_MIME_TYPES);
   glade_gtk_filter_write_strings (widget, context, strings_node, FILTER_MIME, "glade-mime-types");
diff --git a/plugins/gtk+/glade-gtk-scale.c b/plugins/gtk+/glade-gtk-scale.c
index f788296b..60adabf9 100644
--- a/plugins/gtk+/glade-gtk-scale.c
+++ b/plugins/gtk+/glade-gtk-scale.c
@@ -38,7 +38,7 @@ glade_gtk_scale_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_scale_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 void
@@ -65,5 +65,5 @@ glade_gtk_scale_set_property (GladeWidgetAdaptor *adaptor,
     }
 
   if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-scrollbar.c b/plugins/gtk+/glade-gtk-scrollbar.c
index 7de7ec16..ca010ced 100644
--- a/plugins/gtk+/glade-gtk-scrollbar.c
+++ b/plugins/gtk+/glade-gtk-scrollbar.c
@@ -36,5 +36,5 @@ glade_gtk_scrollbar_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_scrollbar_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-scrolled-window.c b/plugins/gtk+/glade-gtk-scrolled-window.c
index 2e87487a..d0ea47be 100644
--- a/plugins/gtk+/glade-gtk-scrolled-window.c
+++ b/plugins/gtk+/glade-gtk-scrolled-window.c
@@ -36,7 +36,7 @@ glade_gtk_scrolled_window_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_scrolled_window_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 void
@@ -57,7 +57,7 @@ glade_gtk_scrolled_window_set_property (GladeWidgetAdaptor *adaptor,
                                              _("This property is disabled"));
     }
   else if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
 gboolean
diff --git a/plugins/gtk+/glade-gtk-size-group.c b/plugins/gtk+/glade-gtk-size-group.c
index 925ecf6b..f273eb20 100644
--- a/plugins/gtk+/glade-gtk-size-group.c
+++ b/plugins/gtk+/glade-gtk-size-group.c
@@ -89,7 +89,7 @@ glade_gtk_size_group_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   glade_gtk_size_group_read_widgets (widget, node);
 }
@@ -138,7 +138,7 @@ glade_gtk_size_group_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 
   glade_gtk_size_group_write_widgets (widget, context, node);
 }
@@ -176,6 +176,6 @@ glade_gtk_size_group_set_property (GladeWidgetAdaptor *adaptor,
         }
     }
   else
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
                                                  property_name, value);
 }
diff --git a/plugins/gtk+/glade-gtk-spin-button.c b/plugins/gtk+/glade-gtk-spin-button.c
index df7fe686..d78afffd 100644
--- a/plugins/gtk+/glade-gtk-spin-button.c
+++ b/plugins/gtk+/glade-gtk-spin-button.c
@@ -34,7 +34,7 @@ glade_gtk_spin_button_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_spin_button_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static void
@@ -75,5 +75,5 @@ glade_gtk_spin_button_set_property (GladeWidgetAdaptor *adaptor,
   if (!strcmp (id, "adjustment"))
     glade_gtk_spin_button_set_adjustment (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_ENTRY)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_ENTRY)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-stack-switcher.c b/plugins/gtk+/glade-gtk-stack-switcher.c
index c375ac7d..084f3769 100644
--- a/plugins/gtk+/glade-gtk-stack-switcher.c
+++ b/plugins/gtk+/glade-gtk-stack-switcher.c
@@ -35,6 +35,6 @@ glade_gtk_stack_switcher_create_editable (GladeWidgetAdaptor * adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_stack_switcher_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
diff --git a/plugins/gtk+/glade-gtk-stack.c b/plugins/gtk+/glade-gtk-stack.c
index 28bb6796..82fc17bd 100644
--- a/plugins/gtk+/glade-gtk-stack.c
+++ b/plugins/gtk+/glade-gtk-stack.c
@@ -210,7 +210,7 @@ glade_gtk_stack_child_action_activate (GladeWidgetAdaptor * adaptor,
       glade_command_pop_group ();
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                container,
                                                                object,
                                                                action_path);
@@ -223,7 +223,7 @@ glade_gtk_stack_create_editable (GladeWidgetAdaptor * adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_stack_editor_new ();
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 typedef struct {
@@ -368,7 +368,7 @@ glade_gtk_stack_set_property (GladeWidgetAdaptor * adaptor,
   else if (!strcmp (id, "page"))
     glade_gtk_stack_set_page (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
 void
@@ -388,7 +388,7 @@ glade_gtk_stack_get_property (GladeWidgetAdaptor * adaptor,
       g_value_set_int (value, gtk_stack_get_page (GTK_STACK (object)));
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
 }
 
 static void
@@ -432,7 +432,7 @@ glade_gtk_stack_set_child_property (GladeWidgetAdaptor * adaptor,
   if (!strcmp (id, "position"))
     glade_gtk_stack_set_child_position (container, child, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor, container, child, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor, container, child, id, value);
 }
 
 static gboolean
@@ -470,8 +470,8 @@ glade_gtk_stack_verify_property (GladeWidgetAdaptor * adaptor,
     return glade_gtk_stack_verify_n_pages (object, value);
   else if (!strcmp (id, "page"))
     return glade_gtk_stack_verify_page (object, value);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object, id, value);
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object, id, value);
 
   return TRUE;
 }
@@ -542,7 +542,7 @@ glade_gtk_stack_replace_child (GladeWidgetAdaptor * adaptor,
   GladeWidget *gbox;
   gint pages, page;
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                                      container,
                                                      current,
                                                      new_widget);
diff --git a/plugins/gtk+/glade-gtk-switch.c b/plugins/gtk+/glade-gtk-switch.c
index cae415aa..46df4409 100644
--- a/plugins/gtk+/glade-gtk-switch.c
+++ b/plugins/gtk+/glade-gtk-switch.c
@@ -32,7 +32,7 @@ glade_gtk_switch_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_activatable_editor_new (adaptor, NULL);
 
-  return GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 }
 
 void
diff --git a/plugins/gtk+/glade-gtk-table.c b/plugins/gtk+/glade-gtk-table.c
index 71f395a8..dbaa0a28 100644
--- a/plugins/gtk+/glade-gtk-table.c
+++ b/plugins/gtk+/glade-gtk-table.c
@@ -242,7 +242,7 @@ glade_gtk_table_replace_child (GladeWidgetAdaptor *adaptor,
                                GtkWidget          *new_widget)
 {
   /* Chain Up */
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
       (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                            G_OBJECT (container),
                                            G_OBJECT (current),
@@ -367,7 +367,7 @@ glade_gtk_table_set_property (GladeWidgetAdaptor *adaptor,
   else if (!strcmp (id, "n-columns"))
     glade_gtk_table_set_n_common (object, value, FALSE);
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object,
                                                       id, value);
 }
 
@@ -399,8 +399,8 @@ glade_gtk_table_verify_property (GladeWidgetAdaptor *adaptor,
     return glade_gtk_table_verify_n_common (object, value, TRUE);
   else if (!strcmp (id, "n-columns"))
     return glade_gtk_table_verify_n_common (object, value, FALSE);
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
                                                          id, value);
 
   return TRUE;
@@ -413,7 +413,7 @@ glade_gtk_table_set_child_property (GladeWidgetAdaptor *adaptor,
                                     const gchar        *property_name,
                                     GValue             *value)
 {
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
       (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                 container, child,
                                                 property_name, value);
@@ -514,8 +514,8 @@ glade_gtk_table_child_verify_property (GladeWidgetAdaptor *adaptor,
     return glade_gtk_table_verify_right_bottom_attach (child,
                                                        value,
                                                        "top-attach", "n-rows");
-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_verify_property)
-    GWA_GET_CLASS
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_verify_property)
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_verify_property (adaptor,
                                                      container, child,
                                                      id, value);
@@ -716,7 +716,7 @@ glade_gtk_table_child_action_activate (GladeWidgetAdaptor *adaptor,
                                                   "bottom-attach", TRUE, FALSE);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
                                                                container,
                                                                object,
                                                                action_path);
diff --git a/plugins/gtk+/glade-gtk-text-buffer.c b/plugins/gtk+/glade-gtk-text-buffer.c
index 2450a07b..1294e127 100644
--- a/plugins/gtk+/glade-gtk-text-buffer.c
+++ b/plugins/gtk+/glade-gtk-text-buffer.c
@@ -81,5 +81,5 @@ glade_gtk_text_buffer_set_property (GladeWidgetAdaptor * adaptor,
     }
   else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-text-view.c b/plugins/gtk+/glade-gtk-text-view.c
index 76beadfb..79cf23dd 100644
--- a/plugins/gtk+/glade-gtk-text-view.c
+++ b/plugins/gtk+/glade-gtk-text-view.c
@@ -36,7 +36,7 @@ glade_gtk_text_view_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_text_view_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 static gboolean
@@ -73,7 +73,7 @@ glade_gtk_text_view_set_property (GladeWidgetAdaptor *adaptor,
         return;
     }
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
                                                     object,
                                                     property_name, value);
 }
diff --git a/plugins/gtk+/glade-gtk-tool-button.c b/plugins/gtk+/glade-gtk-tool-button.c
index 406797c8..34f68507 100644
--- a/plugins/gtk+/glade-gtk-tool-button.c
+++ b/plugins/gtk+/glade-gtk-tool-button.c
@@ -35,7 +35,7 @@ glade_gtk_tool_button_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_tool_button_editor_new ();
   else
-    return GWA_GET_CLASS (GTK_TYPE_TOOL_ITEM)->create_editable (adaptor, type);
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_TOOL_ITEM)->create_editable (adaptor, type);
 }
 
 static void
@@ -152,7 +152,7 @@ glade_gtk_tool_button_set_property (GladeWidgetAdaptor *adaptor,
   else if (!strcmp (id, "custom-label"))
     glade_gtk_tool_button_set_custom_label (object, value);
   else
-    GWA_GET_CLASS (GTK_TYPE_TOOL_ITEM)->set_property (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_TOOL_ITEM)->set_property (adaptor,
                                                       object, id, value);
 }
 
@@ -204,7 +204,7 @@ glade_gtk_tool_button_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_TOOL_ITEM)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_TOOL_ITEM)->read_widget (adaptor, widget, node);
 
   /* Run this after the load so that icon-widget is resolved. */
   g_signal_connect (glade_widget_get_project (widget),
diff --git a/plugins/gtk+/glade-gtk-tool-item-group.c b/plugins/gtk+/glade-gtk-tool-item-group.c
index 05e3368a..46285231 100644
--- a/plugins/gtk+/glade-gtk-tool-item-group.c
+++ b/plugins/gtk+/glade-gtk-tool-item-group.c
@@ -94,7 +94,7 @@ glade_gtk_tool_item_group_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_TOOL_ITEM)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_TOOL_ITEM)->read_widget (adaptor, widget, node);
 
   /* Run this after the load so that icon-widget is resolved. */
   g_signal_connect (glade_widget_get_project (widget),
@@ -149,7 +149,7 @@ glade_gtk_tool_item_group_set_property (GladeWidgetAdaptor *adaptor,
         gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (object), label);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
 GladeEditable *
@@ -160,7 +160,7 @@ glade_gtk_tool_item_group_create_editable (GladeWidgetAdaptor *adaptor,
 
   /* Get base editable */
   editable =
-      GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 
   if (type == GLADE_PAGE_GENERAL)
     return (GladeEditable *) glade_tool_item_group_editor_new (adaptor, editable);
diff --git a/plugins/gtk+/glade-gtk-tool-item.c b/plugins/gtk+/glade-gtk-tool-item.c
index aefda410..aa0d2863 100644
--- a/plugins/gtk+/glade-gtk-tool-item.c
+++ b/plugins/gtk+/glade-gtk-tool-item.c
@@ -33,7 +33,7 @@ glade_gtk_tool_item_constructor (GType type,
   GladeWidgetAdaptor *adaptor;
   GObject *ret_obj;
 
-  ret_obj = GWA_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
+  ret_obj = GLADE_WIDGET_ADAPTOR_GET_OCLASS (GTK_TYPE_CONTAINER)->constructor
       (type, n_construct_properties, construct_properties);
 
   adaptor = GLADE_WIDGET_ADAPTOR (ret_obj);
@@ -68,6 +68,6 @@ glade_gtk_tool_item_set_property (GladeWidgetAdaptor *adaptor,
 
   if (GLADE_PROPERTY_DEF_VERSION_CHECK
       (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
                                                       value);
 }
diff --git a/plugins/gtk+/glade-gtk-tool-palette.c b/plugins/gtk+/glade-gtk-tool-palette.c
index 1e806218..248eb2de 100644
--- a/plugins/gtk+/glade-gtk-tool-palette.c
+++ b/plugins/gtk+/glade-gtk-tool-palette.c
@@ -38,7 +38,7 @@ glade_gtk_tool_palette_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_tool_palette_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 void
@@ -60,7 +60,7 @@ glade_gtk_tool_palette_get_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     {                           /* Chain Up */
-      GWA_GET_CLASS
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
           (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                     container, child,
                                                     property_name, value);
@@ -98,7 +98,7 @@ glade_gtk_tool_palette_set_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -238,6 +238,6 @@ glade_gtk_tool_palette_action_activate (GladeWidgetAdaptor *adaptor,
       glade_gtk_tool_palette_launch_editor (adaptor, object);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 }
diff --git a/plugins/gtk+/glade-gtk-toolbar.c b/plugins/gtk+/glade-gtk-toolbar.c
index 8f34b0f9..8b3fd2d8 100644
--- a/plugins/gtk+/glade-gtk-toolbar.c
+++ b/plugins/gtk+/glade-gtk-toolbar.c
@@ -118,7 +118,7 @@ glade_gtk_toolbar_get_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     {                           /* Chain Up */
-      GWA_GET_CLASS
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
           (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                     container, child,
                                                     property_name, value);
@@ -155,7 +155,7 @@ glade_gtk_toolbar_set_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -293,7 +293,7 @@ glade_gtk_toolbar_action_activate (GladeWidgetAdaptor *adaptor,
       glade_gtk_toolbar_launch_editor (adaptor, object);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 }
 
@@ -309,7 +309,7 @@ glade_gtk_toolbar_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and write all the normal properties (including "use-stock")... */
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context, node);
 
   glade_gtk_write_icon_size (widget, context, node, "icon-size");
 }
diff --git a/plugins/gtk+/glade-gtk-tree-view.c b/plugins/gtk+/glade-gtk-tree-view.c
index a14498ea..74afcb86 100644
--- a/plugins/gtk+/glade-gtk-tree-view.c
+++ b/plugins/gtk+/glade-gtk-tree-view.c
@@ -42,7 +42,7 @@ glade_gtk_treeview_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_real_tree_view_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
 
 gboolean
@@ -116,7 +116,7 @@ glade_gtk_treeview_action_activate (GladeWidgetAdaptor *adaptor,
       glade_gtk_treeview_launch_editor (object);
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
                                                          object, action_path);
 }
 
@@ -149,7 +149,7 @@ glade_gtk_treeview_get_child_property (GladeWidgetAdaptor *adaptor,
                                                           (child)));
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -173,7 +173,7 @@ glade_gtk_treeview_set_child_property (GladeWidgetAdaptor *adaptor,
     }
   else
     /* Chain Up */
-    GWA_GET_CLASS
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
                                                   container, child,
                                                   property_name, value);
@@ -307,5 +307,5 @@ glade_gtk_treeview_set_property (GladeWidgetAdaptor *adaptor,
     }
 
   if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-viewport.c b/plugins/gtk+/glade-gtk-viewport.c
index d18630e0..d678f5a2 100644
--- a/plugins/gtk+/glade-gtk-viewport.c
+++ b/plugins/gtk+/glade-gtk-viewport.c
@@ -36,5 +36,5 @@ glade_gtk_viewport_create_editable (GladeWidgetAdaptor *adaptor,
       return (GladeEditable *)glade_viewport_editor_new ();
     }
 
-  return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+  return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
 }
diff --git a/plugins/gtk+/glade-gtk-widget.c b/plugins/gtk+/glade-gtk-widget.c
index b67eb685..5bf06423 100644
--- a/plugins/gtk+/glade-gtk-widget.c
+++ b/plugins/gtk+/glade-gtk-widget.c
@@ -80,7 +80,7 @@ glade_gtk_widget_destroy_object (GladeWidgetAdaptor *adaptor,
 {
   gtk_widget_destroy (GTK_WIDGET (object));
 
-  GWA_GET_CLASS (G_TYPE_OBJECT)->destroy_object (adaptor, object);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->destroy_object (adaptor, object);
 }
 
 static void
@@ -326,7 +326,7 @@ glade_gtk_widget_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
   /* Read in accelerators */
   glade_gtk_read_accels (widget, node, TRUE);
@@ -607,7 +607,7 @@ glade_gtk_widget_write_widget (GladeWidgetAdaptor *adaptor,
     glade_property_write (prop, context, node);
 
   /* Finally chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
 }
 
 void
@@ -624,7 +624,7 @@ glade_gtk_widget_write_widget_after (GladeWidgetAdaptor *adaptor,
   glade_gtk_widget_write_style_classes (widget, context, node);
 
   /* Finally chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget_after (adaptor, widget, context, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget_after (adaptor, widget, context, node);
 }
 
 GladeEditorProperty *
@@ -645,7 +645,7 @@ glade_gtk_widget_create_eprop (GladeWidgetAdaptor *adaptor,
   else if (pspec->value_type == GLADE_TYPE_STRING_LIST)
     eprop = glade_eprop_string_list_new (def, use_command, FALSE, FALSE);
   else
-    eprop = GWA_GET_CLASS
+    eprop = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->create_eprop (adaptor, def, use_command);
 
   return eprop;
@@ -661,7 +661,7 @@ glade_gtk_widget_create_editable (GladeWidgetAdaptor *adaptor,
   if (type == GLADE_PAGE_COMMON)
     editable = (GladeEditable *)glade_widget_editor_new ();
   else
-    editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
+    editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
 
   return editable;
 }
@@ -684,7 +684,7 @@ glade_gtk_widget_string_from_value (GladeWidgetAdaptor *adaptor,
       return glade_string_list_to_string (list);
     }
   else
-    return GWA_GET_CLASS
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
         (G_TYPE_OBJECT)->string_from_value (adaptor, def, value);
 }
 
@@ -723,7 +723,7 @@ glade_gtk_widget_deep_post_create (GladeWidgetAdaptor *adaptor,
 
   glade_widget_set_action_sensitive (gwidget, "remove_parent", FALSE);
 
-  if (GWA_IS_TOPLEVEL (adaptor) || glade_widget_get_internal (gwidget))
+  if (GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor) || glade_widget_get_internal (gwidget))
     glade_widget_set_action_sensitive (gwidget, "add_parent", FALSE);
 
   /* Watch parents/projects and set actions sensitive/insensitive */
@@ -778,7 +778,7 @@ glade_gtk_widget_set_property (GladeWidgetAdaptor *adaptor,
                               (GDestroyNotify) glade_string_list_free);
     }
   else
-      GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
+      GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
 }
 
 void
@@ -791,7 +791,7 @@ glade_gtk_widget_get_property (GladeWidgetAdaptor * adaptor,
       id = "tooltip-text";
     }
 
-  GWA_GET_CLASS (G_TYPE_OBJECT)->get_property (adaptor, object, id, value);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->get_property (adaptor, object, id, value);
 }
 
 
@@ -997,7 +997,7 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor *adaptor,
                              NULL);
     }
   else
-    GWA_GET_CLASS (G_TYPE_OBJECT)->action_activate (adaptor,
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->action_activate (adaptor,
                                                     object, action_path);
 }
 
@@ -1128,8 +1128,8 @@ glade_gtk_widget_action_submenu (GladeWidgetAdaptor *adaptor,
 
       return menu;
     }
-  else if (GWA_GET_CLASS (G_TYPE_OBJECT)->action_submenu)
-    return GWA_GET_CLASS (G_TYPE_OBJECT)->action_submenu (adaptor,
+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->action_submenu)
+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->action_submenu (adaptor,
                                                           object, action_path);
 
   return NULL;
diff --git a/plugins/gtk+/glade-gtk-window.c b/plugins/gtk+/glade-gtk-window.c
index 5daa30b6..00da7afe 100644
--- a/plugins/gtk+/glade-gtk-window.c
+++ b/plugins/gtk+/glade-gtk-window.c
@@ -153,7 +153,7 @@ glade_gtk_window_read_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->read_widget (adaptor, widget, node);
 
   /* Sync the icon mode */
   if (glade_widget_property_original_default (widget, "icon") == FALSE)
@@ -206,7 +206,7 @@ glade_gtk_window_write_widget (GladeWidgetAdaptor *adaptor,
     return;
 
   /* First chain up and read in all the normal properties.. */
-  GWA_GET_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context,
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context,
                                                  node);
 
   glade_gtk_window_write_accel_groups (widget, context, node);
@@ -242,7 +242,7 @@ glade_gtk_window_create_editable (GladeWidgetAdaptor *adaptor,
         editable = (GladeEditable *) glade_window_editor_new ();
     }
   else
-    editable = GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+    editable = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
 
   return editable;
 }
@@ -291,7 +291,7 @@ glade_gtk_window_set_property (GladeWidgetAdaptor *adaptor,
         }
     }
   else
-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
 void
@@ -312,7 +312,7 @@ glade_gtk_window_replace_child (GladeWidgetAdaptor *adaptor,
     }
 
   /* Chain Up */
-  GWA_GET_CLASS
+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
       (GTK_TYPE_CONTAINER)->replace_child (adaptor,
                                            G_OBJECT (container),
                                            G_OBJECT (current),
diff --git a/plugins/webkit2gtk/glade-webkit2gtk.c b/plugins/webkit2gtk/glade-webkit2gtk.c
index 170ee918..d173d58e 100644
--- a/plugins/webkit2gtk/glade-webkit2gtk.c
+++ b/plugins/webkit2gtk/glade-webkit2gtk.c
@@ -58,5 +58,5 @@ glade_webkit_web_view_set_property (GladeWidgetAdaptor *adaptor,
       webkit_web_view_load_uri (WEBKIT_WEB_VIEW (object), full_url);
     }
   else
-    GWA_GET_CLASS(GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS(GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
 }