gdk: Replace GDK_NONE with NULL

15 files changed, 86 insertions, 86 deletions

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 7d4d07de82..aaf2293670 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -2948,7 +2948,7 @@ gtk_calendar_drag_motion (GtkWidget      *widget,
     }
 
   target = gtk_drag_dest_find_target (widget, context, NULL);
-  if (target == GDK_NONE || gdk_drag_context_get_suggested_action (context) == 0)
+  if (target == NULL || gdk_drag_context_get_suggested_action (context) == 0)
     gdk_drag_status (context, 0, time);
   else
     {
@@ -2969,7 +2969,7 @@ gtk_calendar_drag_drop (GtkWidget      *widget,
   GdkAtom target;
 
   target = gtk_drag_dest_find_target (widget, context, NULL);
-  if (target != GDK_NONE)
+  if (target != NULL)
     {
       gtk_drag_get_data (widget, context,
                          target,
diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index 46cbca9606..6f0f72d9c0 100644
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -945,7 +945,7 @@ clipboard_peek (GdkDisplay *display,
   GSList *clipboards;
   GSList *tmp_list;
 
-  if (selection == GDK_NONE)
+  if (selection == NULL)
     selection = GDK_SELECTION_CLIPBOARD;
 
   clipboards = g_object_get_data (G_OBJECT (display), "gtk-clipboard-list");
@@ -1122,7 +1122,7 @@ _gtk_clipboard_store_all (void)
 GdkAtom
 gtk_clipboard_get_selection (GtkClipboard *clipboard)
 {
-  g_return_val_if_fail (GTK_IS_CLIPBOARD (clipboard), GDK_NONE);
+  g_return_val_if_fail (GTK_IS_CLIPBOARD (clipboard), NULL);
 
   return clipboard->selection;
 }
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 5379be87da..0eb6c1635b 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -315,7 +315,7 @@ clipboard_display_closed (GdkDisplay   *display,
  * Returns the clipboard object for the given selection.
  * Cut/copy/paste menu items and keyboard shortcuts should use
  * the default clipboard, returned by passing %GDK_SELECTION_CLIPBOARD for @selection.
- * (%GDK_NONE is supported as a synonym for GDK_SELECTION_CLIPBOARD
+ * (%NULL is supported as a synonym for GDK_SELECTION_CLIPBOARD
  * for backwards compatibility reasons.)
  * The currently-selected object or text should be provided on the clipboard
  * identified by #GDK_SELECTION_PRIMARY. Cut/copy/paste menu items
@@ -323,7 +323,7 @@ clipboard_display_closed (GdkDisplay   *display,
  * to the default clipboard, i.e. they copy the selection to what the
  * user sees as the clipboard.
  *
- * (Passing #GDK_NONE is the same as using `gdk_atom_intern
+ * (Passing #NULL is the same as using `gdk_atom_intern
  * ("CLIPBOARD", FALSE)`.
  *
  * See the
@@ -995,7 +995,7 @@ gtk_clipboard_request_contents (GtkClipboard            *clipboard,
 				gpointer                 user_data)
 {
   g_return_if_fail (clipboard != NULL);
-  g_return_if_fail (target != GDK_NONE);
+  g_return_if_fail (target != NULL);
   g_return_if_fail (callback != NULL);
 
   GTK_CLIPBOARD_GET_CLASS (clipboard)->request_contents (clipboard,
@@ -1428,7 +1428,7 @@ gtk_clipboard_wait_for_contents (GtkClipboard *clipboard,
   WaitResults results;
 
   g_return_val_if_fail (clipboard != NULL, NULL);
-  g_return_val_if_fail (target != GDK_NONE, NULL);
+  g_return_val_if_fail (target != NULL, NULL);
   
   results.data = NULL;
   results.loop = g_main_loop_new (NULL, TRUE);
@@ -1988,7 +1988,7 @@ clipboard_peek (GdkDisplay *display,
   GSList *clipboards;
   GSList *tmp_list;
 
-  if (selection == GDK_NONE)
+  if (selection == NULL)
     selection = GDK_SELECTION_CLIPBOARD;
 
   clipboards = g_object_get_data (G_OBJECT (display), "gtk-clipboard-list");
@@ -2298,7 +2298,7 @@ _gtk_clipboard_store_all (void)
 GdkAtom
 gtk_clipboard_get_selection (GtkClipboard *clipboard)
 {
-  g_return_val_if_fail (GTK_IS_CLIPBOARD (clipboard), GDK_NONE);
+  g_return_val_if_fail (GTK_IS_CLIPBOARD (clipboard), NULL);
 
   return clipboard->selection;
 }
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index e6162fbd61..7718989ae1 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -113,7 +113,7 @@ struct _GtkDragFindData
   guint target_info;
   GtkSelectionData selection_data;
 
-  selection_data.selection = GDK_NONE;
+  selection_data.selection = NULL;
   selection_data.data = NULL;
   selection_data.length = -1;
   selection_data.target = gdk_quartz_pasteboard_type_to_atom_libgtk_only (type);
@@ -834,7 +834,7 @@ gtk_drag_dest_drop (GtkWidget	     *widget,
     {
       GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
 
-      if (target == GDK_NONE)
+      if (target == NULL)
 	{
 	  gtk_drag_finish (context, FALSE, FALSE, time);
 	  return TRUE;
@@ -992,8 +992,8 @@ gtk_drag_dest_find_target (GtkWidget      *widget,
   GList *tmp_source = NULL;
   GList *source_targets;
 
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), GDK_NONE);
-  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), GDK_NONE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
 
   dragging_info = gdk_quartz_drag_context_get_dragging_info_libgtk_only (context);
   pasteboard = [dragging_info draggingPasteboard];
@@ -1004,7 +1004,7 @@ gtk_drag_dest_find_target (GtkWidget      *widget,
     target_list = gtk_drag_dest_get_target_list (widget);
   
   if (target_list == NULL)
-    return GDK_NONE;
+    return NULL;
 
   source_targets = _gtk_quartz_pasteboard_types_to_atom_list ([pasteboard types]);
   tmp_target = target_list->list;
@@ -1031,7 +1031,7 @@ gtk_drag_dest_find_target (GtkWidget      *widget,
     }
 
   g_list_free (source_targets);
-  return GDK_NONE;
+  return NULL;
 }
 
 static gboolean
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 3caf43a375..412e57cd46 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -632,7 +632,7 @@ gtk_drag_finish (GdkDragContext *context,
                  gboolean        del,
                  guint32         time)
 {
-  GdkAtom target = GDK_NONE;
+  GdkAtom target = NULL;
 
   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
 
@@ -641,7 +641,7 @@ gtk_drag_finish (GdkDragContext *context,
       target = gdk_atom_intern_static_string ("DELETE");
     }
 
-  if (target != GDK_NONE)
+  if (target != NULL)
     {
       GtkWidget *selection_widget = gtk_drag_get_ipc_widget_for_display (gdk_window_get_display (gdk_drag_context_get_source_window (context)));
 
@@ -1142,7 +1142,7 @@ gtk_drag_dest_drop (GtkWidget      *widget,
     {
       GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
 
-      if (target == GDK_NONE)
+      if (target == NULL)
         {
           gtk_drag_finish (context, FALSE, FALSE, time);
           return TRUE;
@@ -1882,7 +1882,7 @@ gtk_drag_drop (GtkDragSourceInfo *info,
           
           if (pair->target == target1 || pair->target == target2)
             {
-              selection_data.selection = GDK_NONE;
+              selection_data.selection = NULL;
               selection_data.target = pair->target;
               selection_data.data = NULL;
               selection_data.length = -1;
@@ -1926,7 +1926,7 @@ gtk_drag_selection_get (GtkWidget        *widget,
                         gpointer          data)
 {
   GtkDragSourceInfo *info = data;
-  static GdkAtom null_atom = GDK_NONE;
+  static GdkAtom null_atom = NULL;
   guint target_info;
 
   if (!null_atom)
diff --git a/gtk/gtkdragdest.c b/gtk/gtkdragdest.c
index ccbc7b6690..fa2ac1b8ad 100644
--- a/gtk/gtkdragdest.c
+++ b/gtk/gtkdragdest.c
@@ -397,14 +397,14 @@ gtk_drag_dest_get_track_motion (GtkWidget *widget)
  *
  * Looks for a match between the supported targets of @context and the
  * @dest_target_list, returning the first matching target, otherwise
- * returning %GDK_NONE. @dest_target_list should usually be the return
+ * returning %NULL. @dest_target_list should usually be the return
  * value from gtk_drag_dest_get_target_list(), but some widgets may
  * have different valid targets for different parts of the widget; in
  * that case, they will have to implement a drag_motion handler that
  * passes the correct target list to this function.
  *
- * Returns: (transfer none): first target that the source offers
- *     and the dest can accept, or %GDK_NONE
+ * Returns: (transfer none) (nullable): first target that the source offers
+ *     and the dest can accept, or %NULL
  */
 GdkAtom
 gtk_drag_dest_find_target (GtkWidget      *widget,
@@ -415,15 +415,15 @@ gtk_drag_dest_find_target (GtkWidget      *widget,
   GList *tmp_source = NULL;
   GtkWidget *source_widget;
 
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), GDK_NONE);
-  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), GDK_NONE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
 
   source_widget = gtk_drag_get_source_widget (context);
   if (target_list == NULL)
     target_list = gtk_drag_dest_get_target_list (widget);
 
   if (target_list == NULL)
-    return GDK_NONE;
+    return NULL;
 
   tmp_target = target_list->list;
   while (tmp_target)
@@ -447,6 +447,6 @@ gtk_drag_dest_find_target (GtkWidget      *widget,
       tmp_target = tmp_target->next;
     }
 
-  return GDK_NONE;
+  return NULL;
 }
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 9f5decaf0c..400ac1f05d 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -8870,12 +8870,12 @@ gtk_entry_drag_drop  (GtkWidget        *widget,
 {
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = entry->priv;
-  GdkAtom target = GDK_NONE;
+  GdkAtom target = NULL;
 
   if (priv->editable)
     target = gtk_drag_dest_find_target (widget, context, NULL);
 
-  if (target != GDK_NONE)
+  if (target != NULL)
     gtk_drag_get_data (widget, context, target, time);
   else
     gtk_drag_finish (context, FALSE, FALSE, time);
@@ -8901,7 +8901,7 @@ gtk_entry_drag_motion (GtkWidget        *widget,
   new_position = gtk_entry_find_position (entry, x + priv->scroll_offset);
 
   if (priv->editable &&
-      gtk_drag_dest_find_target (widget, context, NULL) != GDK_NONE)
+      gtk_drag_dest_find_target (widget, context, NULL) != NULL)
     {
       source_widget = gtk_drag_get_source_widget (context);
       suggested_action = gdk_drag_context_get_suggested_action (context);
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 48771e5dc4..2e073e6224 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -6003,7 +6003,7 @@ set_destination (GtkIconView    *icon_view,
   widget = GTK_WIDGET (icon_view);
 
   *suggested_action = 0;
-  *target = GDK_NONE;
+  *target = NULL;
 
   if (!icon_view->priv->dest_set)
     {
@@ -6022,7 +6022,7 @@ set_destination (GtkIconView    *icon_view,
 
   *target = gtk_drag_dest_find_target (widget, context,
                                        gtk_drag_dest_get_target_list (widget));
-  if (*target == GDK_NONE)
+  if (*target == NULL)
     return FALSE;
 
   if (!gtk_icon_view_get_dest_item_at_pos (icon_view, x, y, &path, &pos)) 
@@ -6419,7 +6419,7 @@ gtk_icon_view_drag_drop (GtkWidget      *widget,
   GtkIconView *icon_view;
   GtkTreePath *path;
   GdkDragAction suggested_action = 0;
-  GdkAtom target = GDK_NONE;
+  GdkAtom target = NULL;
   GtkTreeModel *model;
   gboolean drop_append_mode;
 
@@ -6439,7 +6439,7 @@ gtk_icon_view_drag_drop (GtkWidget      *widget,
   
   path = get_logical_destination (icon_view, &drop_append_mode);
 
-  if (target != GDK_NONE && path != NULL)
+  if (target != NULL && path != NULL)
     {
       /* in case a motion had requested drag data, change things so we
        * treat drag data receives as a drop.
@@ -6455,7 +6455,7 @@ gtk_icon_view_drag_drop (GtkWidget      *widget,
   /* Unset this thing */
   gtk_icon_view_set_drag_dest_item (icon_view, NULL, GTK_ICON_VIEW_DROP_LEFT);
 
-  if (target != GDK_NONE)
+  if (target != NULL)
     {
       gtk_drag_get_data (widget, context, target, time);
       return TRUE;
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index e758d2a1ec..c49ea3b019 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -1635,7 +1635,7 @@ get_drag_data (GtkWidget      *list_box,
 
   target = gtk_drag_dest_find_target (list_box, context, NULL);
 
-  if (target == GDK_NONE)
+  if (target == NULL)
     return FALSE;
 
   gtk_drag_get_data (list_box, context, target, time);
@@ -2009,7 +2009,7 @@ drag_data_received_callback (GtkWidget        *list_box,
 
   if (!sidebar->drag_data_received)
     {
-      if (gtk_selection_data_get_target (selection_data) != GDK_NONE &&
+      if (gtk_selection_data_get_target (selection_data) != NULL &&
           info == DND_TEXT_URI_LIST)
         {
           gchar **uris;
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index c72f695dc0..8d6f503aa1 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -733,7 +733,7 @@ gtk_selection_owner_set_for_display (GdkDisplay   *display,
   GdkWindow *window;
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-  g_return_val_if_fail (selection != GDK_NONE, FALSE);
+  g_return_val_if_fail (selection != NULL, FALSE);
   g_return_val_if_fail (widget == NULL || gtk_widget_get_realized (widget), FALSE);
   g_return_val_if_fail (widget == NULL || gtk_widget_get_display (widget) == display, FALSE);
   
@@ -826,7 +826,7 @@ gtk_selection_owner_set (GtkWidget *widget,
   GdkDisplay *display;
   
   g_return_val_if_fail (widget == NULL || gtk_widget_get_realized (widget), FALSE);
-  g_return_val_if_fail (selection != GDK_NONE, FALSE);
+  g_return_val_if_fail (selection != NULL, FALSE);
 
   if (widget)
     display = gtk_widget_get_display (widget);
@@ -919,7 +919,7 @@ gtk_selection_clear_targets (GtkWidget *widget,
   GList *lists;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (selection != GDK_NONE);
+  g_return_if_fail (selection != NULL);
 
   gdk_selection_clear_targets (gtk_widget_get_display (widget), selection);
 
@@ -963,7 +963,7 @@ gtk_selection_add_target (GtkWidget	    *widget,
   GtkTargetList *list;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (selection != GDK_NONE);
+  g_return_if_fail (selection != NULL);
 
   list = gtk_selection_target_list_get (widget, selection);
   gtk_target_list_add (list, target, 0, info);
@@ -990,7 +990,7 @@ gtk_selection_add_targets (GtkWidget     *widget,
   guint n_targets;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (selection != GDK_NONE);
+  g_return_if_fail (selection != NULL);
   g_return_if_fail (targets != NULL);
   
   list = gtk_selection_target_list_get (widget, selection);
@@ -1092,7 +1092,7 @@ gtk_selection_convert (GtkWidget *widget,
   guint id;
   
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-  g_return_val_if_fail (selection != GDK_NONE, FALSE);
+  g_return_val_if_fail (selection != NULL, FALSE);
   
   if (initialize)
     gtk_selection_init ();
@@ -2449,7 +2449,7 @@ _gtk_selection_request (GtkWidget *widget,
       mult_atoms = NULL;
       
       gdk_error_trap_push ();
-      if (!gdk_property_get (info->requestor, property, GDK_NONE, /* AnyPropertyType */
+      if (!gdk_property_get (info->requestor, property, NULL, /* AnyPropertyType */
 			     0, selection_max_size, FALSE,
 			     &type, &format, &length, &mult_atoms))
 	{
@@ -2457,7 +2457,7 @@ _gtk_selection_request (GtkWidget *widget,
 						 requestor, 
 						 selection,
 						 target, 
-						 GDK_NONE, 
+						 NULL, 
 						 time);
 	  g_free (mult_atoms);
 	  g_slice_free (GtkIncrInfo, info);
@@ -2534,7 +2534,7 @@ _gtk_selection_request (GtkWidget *widget,
       gtk_selection_invoke_handler (widget, &data, time);
       if (data.length < 0)
 	{
-	  info->conversions[i].property = GDK_NONE;
+	  info->conversions[i].property = NULL;
 	  continue;
 	}
       
@@ -2625,14 +2625,14 @@ _gtk_selection_request (GtkWidget *widget,
     }
 
   if (info->num_conversions == 1 &&
-      info->conversions[0].property == GDK_NONE)
+      info->conversions[0].property == NULL)
     {
       /* Reject the entire conversion */
       gdk_selection_send_notify_for_display (gtk_widget_get_display (widget),
 					     requestor, 
 					     selection, 
 					     target, 
-					     GDK_NONE, 
+					     NULL, 
 					     time);
     }
   else
@@ -2885,18 +2885,18 @@ _gtk_selection_notify (GtkWidget	 *widget,
   if (!tmp_list)		/* no retrieval in progress */
     return FALSE;
 
-  if (property != GDK_NONE)
+  if (property != NULL)
     length = gdk_selection_property_get (window, &buffer,
 					 &type, &format);
   else
     length = 0; /* silence gcc */
   
-  if (property == GDK_NONE || buffer == NULL)
+  if (property == NULL || buffer == NULL)
     {
       current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
       g_list_free (tmp_list);
       /* structure will be freed in timeout */
-      gtk_selection_retrieval_report (info, GDK_NONE, 0, NULL, -1, time);
+      gtk_selection_retrieval_report (info, NULL, 0, NULL, -1, time);
       
       return TRUE;
     }
@@ -3002,15 +3002,15 @@ _gtk_selection_property_notify (GtkWidget	*widget,
      doing memory allocation at every step. But its only guaranteed to
      be a _lower bound_ (pretty useless!) */
   
-  if (length == 0 || type == GDK_NONE)		/* final zero length portion */
+  if (length == 0 || type == NULL)		/* final zero length portion */
     {
       /* Info structure will be freed in timeout */
       current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
       g_list_free (tmp_list);
       gtk_selection_retrieval_report (info,
 				      type, format, 
-				      (type == GDK_NONE) ?  NULL : info->buffer,
-				      (type == GDK_NONE) ?  -1 : info->offset,
+				      (type == NULL) ?  NULL : info->buffer,
+				      (type == NULL) ?  -1 : info->offset,
 				      info->notify_time);
     }
   else				/* append on newly arrived data */
@@ -3074,7 +3074,7 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info)
 	{
 	  current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
 	  g_list_free (tmp_list);
-	  gtk_selection_retrieval_report (info, GDK_NONE, 0, NULL, -1, GDK_CURRENT_TIME);
+	  gtk_selection_retrieval_report (info, NULL, 0, NULL, -1, GDK_CURRENT_TIME);
 	}
       
       g_free (info->buffer);
diff --git a/gtk/gtktextbufferrichtext.c b/gtk/gtktextbufferrichtext.c
index 110f182dc6..4286d8b846 100644
--- a/gtk/gtktextbufferrichtext.c
+++ b/gtk/gtktextbufferrichtext.c
@@ -79,9 +79,9 @@ gtk_text_buffer_register_serialize_format (GtkTextBuffer              *buffer,
   GList   *formats;
   GdkAtom  atom;
 
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), GDK_NONE);
-  g_return_val_if_fail (mime_type != NULL && *mime_type != '\0', GDK_NONE);
-  g_return_val_if_fail (function != NULL, GDK_NONE);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (mime_type != NULL && *mime_type != '\0', NULL);
+  g_return_val_if_fail (function != NULL, NULL);
 
   formats = g_object_steal_qdata (G_OBJECT (buffer), serialize_quark ());
 
@@ -133,8 +133,8 @@ gtk_text_buffer_register_serialize_tagset (GtkTextBuffer *buffer,
   gchar *mime_type;
   GdkAtom format;
 
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), GDK_NONE);
-  g_return_val_if_fail (tagset_name == NULL || *tagset_name != '\0', GDK_NONE);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (tagset_name == NULL || *tagset_name != '\0', NULL);
 
   if (tagset_name)
     {
@@ -182,9 +182,9 @@ gtk_text_buffer_register_deserialize_format (GtkTextBuffer                *buffe
   GList   *formats;
   GdkAtom  atom;
 
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), GDK_NONE);
-  g_return_val_if_fail (mime_type != NULL && *mime_type != '\0', GDK_NONE);
-  g_return_val_if_fail (function != NULL, GDK_NONE);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (mime_type != NULL && *mime_type != '\0', NULL);
+  g_return_val_if_fail (function != NULL, NULL);
 
   formats = g_object_steal_qdata (G_OBJECT (buffer), deserialize_quark ());
 
@@ -222,8 +222,8 @@ gtk_text_buffer_register_deserialize_tagset (GtkTextBuffer *buffer,
   gchar *mime_type;
   GdkAtom  format;
 
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), GDK_NONE);
-  g_return_val_if_fail (tagset_name == NULL || *tagset_name != '\0', GDK_NONE);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (tagset_name == NULL || *tagset_name != '\0', NULL);
 
   if (tagset_name)
     {
@@ -263,7 +263,7 @@ gtk_text_buffer_unregister_serialize_format (GtkTextBuffer *buffer,
   GList *formats;
 
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-  g_return_if_fail (format != GDK_NONE);
+  g_return_if_fail (format != NULL);
 
   formats = g_object_steal_qdata (G_OBJECT (buffer), serialize_quark ());
 
@@ -293,7 +293,7 @@ gtk_text_buffer_unregister_deserialize_format (GtkTextBuffer *buffer,
   GList *formats;
 
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-  g_return_if_fail (format != GDK_NONE);
+  g_return_if_fail (format != NULL);
 
   formats = g_object_steal_qdata (G_OBJECT (buffer), deserialize_quark ());
 
@@ -341,7 +341,7 @@ gtk_text_buffer_deserialize_set_can_create_tags (GtkTextBuffer *buffer,
   gchar *format_name;
 
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-  g_return_if_fail (format != GDK_NONE);
+  g_return_if_fail (format != NULL);
 
   formats = g_object_get_qdata (G_OBJECT (buffer), deserialize_quark ());
 
@@ -384,7 +384,7 @@ gtk_text_buffer_deserialize_get_can_create_tags (GtkTextBuffer *buffer,
   gchar *format_name;
 
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
-  g_return_val_if_fail (format != GDK_NONE, FALSE);
+  g_return_val_if_fail (format != NULL, FALSE);
 
   formats = g_object_get_qdata (G_OBJECT (buffer), deserialize_quark ());
 
@@ -497,7 +497,7 @@ gtk_text_buffer_serialize (GtkTextBuffer     *register_buffer,
 
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (register_buffer), NULL);
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (content_buffer), NULL);
-  g_return_val_if_fail (format != GDK_NONE, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
   g_return_val_if_fail (start != NULL, NULL);
   g_return_val_if_fail (end != NULL, NULL);
   g_return_val_if_fail (length != NULL, NULL);
@@ -558,7 +558,7 @@ gtk_text_buffer_deserialize (GtkTextBuffer  *register_buffer,
 
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (register_buffer), FALSE);
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (content_buffer), FALSE);
-  g_return_val_if_fail (format != GDK_NONE, FALSE);
+  g_return_val_if_fail (format != NULL, FALSE);
   g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (data != NULL, FALSE);
   g_return_val_if_fail (length > 0, FALSE);
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f322a204b6..613e95bde8 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -7970,7 +7970,7 @@ gtk_text_view_drag_motion (GtkWidget        *widget,
   target = gtk_drag_dest_find_target (widget, context,
                                       gtk_drag_dest_get_target_list (widget));
 
-  if (target == GDK_NONE)
+  if (target == NULL)
     {
       /* can't accept any of the offered targets */
     }                                 
@@ -8048,7 +8048,7 @@ gtk_text_view_drag_drop (GtkWidget        *widget,
   GtkTextView *text_view;
   GtkTextViewPrivate *priv;
   GtkTextIter drop_point;
-  GdkAtom target = GDK_NONE;
+  GdkAtom target = NULL;
 
   text_view = GTK_TEXT_VIEW (widget);
   priv = text_view->priv;
@@ -8067,7 +8067,7 @@ gtk_text_view_drag_drop (GtkWidget        *widget,
   if (gtk_text_iter_can_insert (&drop_point, priv->editable))
     target = gtk_drag_dest_find_target (widget, context, NULL);
 
-  if (target != GDK_NONE)
+  if (target != NULL)
     gtk_drag_get_data (widget, context, target, time);
   else
     gtk_drag_finish (context, FALSE, FALSE, time);
@@ -8154,7 +8154,7 @@ gtk_text_view_drag_data_received (GtkWidget        *widget,
           GdkAtom *atoms;
           gint     n_atoms;
           GList   *list;
-          GdkAtom  target = GDK_NONE;
+          GdkAtom  target = NULL;
 
           copy_tags = FALSE;
 
@@ -8174,7 +8174,7 @@ gtk_text_view_drag_data_received (GtkWidget        *widget,
 
           g_free (atoms);
 
-          if (target != GDK_NONE)
+          if (target != NULL)
             {
               gtk_drag_get_data (widget, context, target, time);
               gtk_text_buffer_end_user_action (buffer);
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index b2d85c3f18..3e784f0802 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -181,8 +181,8 @@ struct _GtkToolPaletteDragData
   GtkWidget      *item;
 };
 
-static GdkAtom dnd_target_atom_item = GDK_NONE;
-static GdkAtom dnd_target_atom_group = GDK_NONE;
+static GdkAtom dnd_target_atom_item = NULL;
+static GdkAtom dnd_target_atom_group = NULL;
 
 static const GtkTargetEntry dnd_targets[] =
 {
@@ -218,7 +218,7 @@ gtk_tool_palette_init (GtkToolPalette *palette)
 
   palette->priv->text_size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
 
-  if (dnd_target_atom_item == GDK_NONE)
+  if (dnd_target_atom_item == NULL)
     {
       dnd_target_atom_item = gdk_atom_intern_static_string (dnd_targets[0].target);
       dnd_target_atom_group = gdk_atom_intern_static_string (dnd_targets[1].target);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d623415cfa..c0c082ba5d 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -7258,7 +7258,7 @@ set_destination_row (GtkTreeView    *tree_view,
   gboolean can_drop = FALSE;
 
   *suggested_action = 0;
-  *target = GDK_NONE;
+  *target = NULL;
 
   widget = GTK_WIDGET (tree_view);
 
@@ -7282,7 +7282,7 @@ set_destination_row (GtkTreeView    *tree_view,
 
   *target = gtk_drag_dest_find_target (widget, context,
                                        gtk_drag_dest_get_target_list (widget));
-  if (*target == GDK_NONE)
+  if (*target == NULL)
     {
       return FALSE;
     }
@@ -7755,7 +7755,7 @@ gtk_tree_view_drag_drop (GtkWidget        *widget,
   GtkTreeView *tree_view;
   GtkTreePath *path;
   GdkDragAction suggested_action = 0;
-  GdkAtom target = GDK_NONE;
+  GdkAtom target = NULL;
   TreeViewDragInfo *di;
   GtkTreeModel *model;
   gboolean path_down_mode;
@@ -7781,7 +7781,7 @@ gtk_tree_view_drag_drop (GtkWidget        *widget,
 
   path = get_logical_dest_row (tree_view, &path_down_mode, &drop_append_mode);
 
-  if (target != GDK_NONE && path != NULL)
+  if (target != NULL && path != NULL)
     {
       /* in case a motion had requested drag data, change things so we
        * treat drag data receives as a drop.
@@ -7800,7 +7800,7 @@ gtk_tree_view_drag_drop (GtkWidget        *widget,
                                    NULL,
                                    GTK_TREE_VIEW_DROP_BEFORE);
 
-  if (target != GDK_NONE)
+  if (target != NULL)
     {
       gtk_drag_get_data (widget, context, target, time);
       return TRUE;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index df727ddca1..ac09c77de9 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2754,7 +2754,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    *    }
    *
    *   target = gtk_drag_dest_find_target (widget, context, NULL);
-   *   if (target == GDK_NONE)
+   *   if (target == NULL)
    *     gdk_drag_status (context, 0, time);
    *   else
    *    {