From d5e3897052cdca009309b2f1ec70602b33ee4f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Fri, 14 Oct 2016 21:55:38 +0200
Subject: [PATCH] combobox: Remove deprecated API

---
 docs/reference/gtk/gtk4-sections.txt |  2 --
 gtk/gtkcombobox.c                    | 46 ----------------------------
 gtk/gtkcombobox.h                    |  6 ----
 3 files changed, 54 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 85ec53c0af..3cc742fad0 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -905,8 +905,6 @@ gtk_combo_box_set_add_tearoffs
 gtk_combo_box_get_add_tearoffs
 gtk_combo_box_set_title
 gtk_combo_box_get_title
-gtk_combo_box_set_focus_on_click
-gtk_combo_box_get_focus_on_click
 gtk_combo_box_set_button_sensitivity
 gtk_combo_box_get_button_sensitivity
 gtk_combo_box_get_has_entry
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 603bf4ab05..1367bbba13 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4617,52 +4617,6 @@ gtk_combo_box_get_entry_text_column (GtkComboBox *combo_box)
   return combo_box->priv->text_column;
 }
 
-/**
- * gtk_combo_box_set_focus_on_click:
- * @combo: a #GtkComboBox
- * @focus_on_click: whether the combo box grabs focus when clicked
- *    with the mouse
- *
- * Sets whether the combo box will grab focus when it is clicked with
- * the mouse. Making mouse clicks not grab focus is useful in places
- * like toolbars where you don’t want the keyboard focus removed from
- * the main area of the application.
- *
- * Since: 2.6
- *
- * Deprecated: 3.20: Use gtk_widget_set_focus_on_click() instead
- */
-void
-gtk_combo_box_set_focus_on_click (GtkComboBox *combo_box,
-                                  gboolean     focus_on_click)
-{
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  gtk_widget_set_focus_on_click (GTK_WIDGET (combo_box), focus_on_click);
-}
-
-/**
- * gtk_combo_box_get_focus_on_click:
- * @combo: a #GtkComboBox
- *
- * Returns whether the combo box grabs focus when it is clicked
- * with the mouse. See gtk_combo_box_set_focus_on_click().
- *
- * Returns: %TRUE if the combo box grabs focus when it is
- *     clicked with the mouse.
- *
- * Since: 2.6
- *
- * Deprecated: 3.20: Use gtk_widget_get_focus_on_click() instead
- */
-gboolean
-gtk_combo_box_get_focus_on_click (GtkComboBox *combo_box)
-{
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), FALSE);
-  
-  return gtk_widget_get_focus_on_click (GTK_WIDGET (combo_box));
-}
-
 static void
 gtk_combo_box_buildable_add_child (GtkBuildable *buildable,
                                    GtkBuilder   *builder,
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index d7c859c150..8e5e64af24 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -107,12 +107,6 @@ GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
                                                     gint         column_span);
 
-GDK_DEPRECATED_IN_3_20_FOR(gtk_widget_get_focus_on_click)
-gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
-GDK_DEPRECATED_IN_3_20_FOR(gtk_widget_set_focus_on_click)
-void          gtk_combo_box_set_focus_on_click     (GtkComboBox *combo,
-                                                    gboolean     focus_on_click);
-
 /* get/set active item */
 GDK_AVAILABLE_IN_ALL
 gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);