GladeWidgetAdaptor: fix gir scanner warnings

Rename all macros starting with GWA to GLADE_WIDGET_ADAPTOR

13 files changed, 74 insertions, 74 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 *