Deprecate GtkFontChooser and implementations

These are being replaced by GtkFontDialog
and GtkFontDialogButton

This commit only moves the headers for GtkFontChooserWidget and
GtkFontChooserDialog to deprecated/, and keeps the implementations
in gtk/, since they will eventually be salvaged into a private
GtkFontChooserWindow.
This commit is contained in:
Matthias Clasen 2022-10-26 22:58:21 -04:00
parent a51a6a3ee2
commit 15572b0183
19 changed files with 157 additions and 49 deletions

View File

@ -68,11 +68,13 @@ create_blurred_button (void)
return w;
}
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static GtkWidget *
create_font_button (void)
{
return gtk_font_button_new ();
}
G_GNUC_END_IGNORE_DEPRECATIONS
static GtkWidget *
create_level_bar (void)

View File

@ -45,6 +45,8 @@
#include <stdio.h>
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/**
* GtkFontButton:
*
@ -65,6 +67,8 @@
*
* `GtkFontButton` has a single CSS node with name fontbutton which
* contains a button node with the .font style class.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
typedef struct _GtkFontButtonClass GtkFontButtonClass;
@ -744,6 +748,8 @@ gtk_font_button_get_property (GObject *object,
* Creates a new font picker widget.
*
* Returns: a new font picker widget.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
GtkWidget *
gtk_font_button_new (void)
@ -758,6 +764,8 @@ gtk_font_button_new (void)
* Creates a new font picker widget showing the given font.
*
* Returns: a new font picker widget.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
GtkWidget *
gtk_font_button_new_with_font (const char *fontname)
@ -771,6 +779,8 @@ gtk_font_button_new_with_font (const char *fontname)
* @title: a string containing the font chooser dialog title
*
* Sets the title for the font chooser dialog.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
void
gtk_font_button_set_title (GtkFontButton *font_button,
@ -797,6 +807,8 @@ gtk_font_button_set_title (GtkFontButton *font_button,
*
* Returns: an internal copy of the title string
* which must not be freed.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
const char *
gtk_font_button_get_title (GtkFontButton *font_button)
@ -812,6 +824,8 @@ gtk_font_button_get_title (GtkFontButton *font_button)
* @modal: %TRUE to make the dialog modal
*
* Sets whether the dialog should be modal.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
void
gtk_font_button_set_modal (GtkFontButton *font_button,
@ -837,6 +851,8 @@ gtk_font_button_set_modal (GtkFontButton *font_button,
* Gets whether the dialog is modal.
*
* Returns: %TRUE if the dialog is modal
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
gboolean
gtk_font_button_get_modal (GtkFontButton *font_button)
@ -853,6 +869,8 @@ gtk_font_button_get_modal (GtkFontButton *font_button)
* Returns whether the selected font is used in the label.
*
* Returns: whether the selected font is used in the label.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
gboolean
gtk_font_button_get_use_font (GtkFontButton *font_button)
@ -869,6 +887,8 @@ gtk_font_button_get_use_font (GtkFontButton *font_button)
*
* If @use_font is %TRUE, the font name will be written
* using the selected font.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
void
gtk_font_button_set_use_font (GtkFontButton *font_button,
@ -896,6 +916,8 @@ gtk_font_button_set_use_font (GtkFontButton *font_button,
* Returns whether the selected size is used in the label.
*
* Returns: whether the selected size is used in the label.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
gboolean
gtk_font_button_get_use_size (GtkFontButton *font_button)
@ -913,6 +935,8 @@ gtk_font_button_get_use_size (GtkFontButton *font_button)
*
* If @use_size is %TRUE, the font name will be written using
* the selected size.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead
*/
void
gtk_font_button_set_use_size (GtkFontButton *font_button,

View File

@ -43,29 +43,29 @@ typedef struct _GtkFontButton GtkFontButton;
GDK_AVAILABLE_IN_ALL
GType gtk_font_button_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
GtkWidget *gtk_font_button_new (void);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
GtkWidget *gtk_font_button_new_with_font (const char *fontname);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
const char * gtk_font_button_get_title (GtkFontButton *font_button);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_button_set_title (GtkFontButton *font_button,
const char *title);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
gboolean gtk_font_button_get_modal (GtkFontButton *font_button);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_button_set_modal (GtkFontButton *font_button,
gboolean modal);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
gboolean gtk_font_button_get_use_font (GtkFontButton *font_button);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_button_set_use_font (GtkFontButton *font_button,
gboolean use_font);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
gboolean gtk_font_button_get_use_size (GtkFontButton *font_button);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_button_set_use_size (GtkFontButton *font_button,
gboolean use_size);

View File

@ -25,6 +25,8 @@
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/**
* GtkFontChooser:
*
@ -34,6 +36,9 @@
* In GTK, the main objects that implement this interface are
* [class@Gtk.FontChooserWidget], [class@Gtk.FontChooserDialog] and
* [class@Gtk.FontButton].
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
enum
@ -167,6 +172,9 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
*
* Returns: (nullable) (transfer none): A `PangoFontFamily` representing the
* selected font family
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
PangoFontFamily *
gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser)
@ -187,6 +195,9 @@ gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser)
*
* Returns: (nullable) (transfer none): A `PangoFontFace` representing the
* selected font group details
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
PangoFontFace *
gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser)
@ -204,6 +215,9 @@ gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser)
*
* Returns: A n integer representing the selected font size,
* or -1 if no font size is selected.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
int
gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser)
@ -230,6 +244,9 @@ gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser)
*
* Returns: (nullable) (transfer full): A string with the name
* of the current font
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
char *
gtk_font_chooser_get_font (GtkFontChooser *fontchooser)
@ -250,6 +267,9 @@ gtk_font_chooser_get_font (GtkFontChooser *fontchooser)
* @fontname: a font name like Helvetica 12 or Times Bold 18
*
* Sets the currently-selected font.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_font (GtkFontChooser *fontchooser,
@ -278,6 +298,9 @@ gtk_font_chooser_set_font (GtkFontChooser *fontchooser,
*
* Returns: (nullable) (transfer full): A `PangoFontDescription` for the
* current font
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
PangoFontDescription *
gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser)
@ -297,6 +320,9 @@ gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser)
* @font_desc: a `PangoFontDescription`
*
* Sets the currently-selected font from @font_desc.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser,
@ -315,6 +341,9 @@ gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser,
* Gets the text displayed in the preview area.
*
* Returns: (transfer full): the text displayed in the preview area
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
char *
gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser)
@ -336,6 +365,9 @@ gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser)
* Sets the text displayed in the preview area.
*
* The @text is used to show how the selected font looks.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
@ -354,6 +386,9 @@ gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
* Returns whether the preview entry is shown or not.
*
* Returns: %TRUE if the preview entry is shown or %FALSE if it is hidden.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
gboolean
gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser)
@ -373,6 +408,9 @@ gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser)
* @show_preview_entry: whether to show the editable preview entry or not
*
* Shows or hides the editable preview entry.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
@ -393,6 +431,9 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
*
* Adds a filter function that decides which fonts to display
* in the font chooser.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_filter_func (GtkFontChooser *fontchooser,
@ -447,6 +488,9 @@ _gtk_font_chooser_font_activated (GtkFontChooser *chooser,
* context = gtk_widget_get_pango_context (label);
* pango_context_set_font_map (context, fontmap);
* ```
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser,
@ -467,6 +511,9 @@ gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser,
* or %NULL if it does not have one.
*
* Returns: (nullable) (transfer full): a `PangoFontMap`
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
PangoFontMap *
gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser)
@ -487,6 +534,9 @@ gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser)
* @level: the desired level of granularity
*
* Sets the desired level of granularity for selecting fonts.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_level (GtkFontChooser *fontchooser,
@ -504,6 +554,9 @@ gtk_font_chooser_set_level (GtkFontChooser *fontchooser,
* Returns the current level of granularity for selecting fonts.
*
* Returns: the current granularity level
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
GtkFontChooserLevel
gtk_font_chooser_get_level (GtkFontChooser *fontchooser)
@ -528,6 +581,9 @@ gtk_font_chooser_get_level (GtkFontChooser *fontchooser)
* It can be passed to [func@Pango.AttrFontFeatures.new].
*
* Returns: the currently selected font features
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
char *
gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser)
@ -548,6 +604,9 @@ gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser)
* Gets the language that is used for font features.
*
* Returns: the currently selected language
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
char *
gtk_font_chooser_get_language (GtkFontChooser *fontchooser)
@ -567,6 +626,9 @@ gtk_font_chooser_get_language (GtkFontChooser *fontchooser)
* @language: a language
*
* Sets the language to use for font features.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
* instead
*/
void
gtk_font_chooser_set_language (GtkFontChooser *fontchooser,

View File

@ -107,57 +107,57 @@ struct _GtkFontChooserIface
GDK_AVAILABLE_IN_ALL
GType gtk_font_chooser_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
PangoFontFamily *gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
PangoFontFace *gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
int gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
PangoFontDescription *
gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser,
const PangoFontDescription *font_desc);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
char * gtk_font_chooser_get_font (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_font (GtkFontChooser *fontchooser,
const char *fontname);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
char * gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
const char *text);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
gboolean gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
gboolean show_preview_entry);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_filter_func (GtkFontChooser *fontchooser,
GtkFontFilterFunc filter,
gpointer user_data,
GDestroyNotify destroy);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser,
PangoFontMap *fontmap);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
PangoFontMap * gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_level (GtkFontChooser *fontchooser,
GtkFontChooserLevel level);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
GtkFontChooserLevel
gtk_font_chooser_get_level (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
char * gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
char * gtk_font_chooser_get_language (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
void gtk_font_chooser_set_language (GtkFontChooser *fontchooser,
const char *language);

View File

@ -34,7 +34,7 @@ typedef struct _GtkFontChooserDialog GtkFontChooserDialog;
GDK_AVAILABLE_IN_ALL
GType gtk_font_chooser_dialog_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
GtkWidget* gtk_font_chooser_dialog_new (const char *title,
GtkWindow *parent);

View File

@ -35,7 +35,7 @@ typedef struct _GtkFontChooserWidget GtkFontChooserWidget;
GDK_AVAILABLE_IN_ALL
GType gtk_font_chooser_widget_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_10
GtkWidget* gtk_font_chooser_widget_new (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFontChooserWidget, g_object_unref)

View File

@ -24,6 +24,8 @@ gtk_deprecated_sources = [
'deprecated/gtkcombobox.c',
'deprecated/gtkcomboboxtext.c',
'deprecated/gtkentrycompletion.c',
'deprecated/gtkfontbutton.c',
'deprecated/gtkfontchooser.c',
'deprecated/gtkiconview.c',
'deprecated/gtkliststore.c',
'deprecated/gtkrender.c',
@ -69,6 +71,10 @@ gtk_deprecated_headers = [
'deprecated/gtkcombobox.h',
'deprecated/gtkcomboboxtext.h',
'deprecated/gtkentrycompletion.h',
'deprecated/gtkfontbutton.h',
'deprecated/gtkfontchooser.h',
'deprecated/gtkfontchooserdialog.h',
'deprecated/gtkfontchooserwidget.h',
'deprecated/gtkiconview.h',
'deprecated/gtkliststore.h',
'deprecated/gtkrender.h',

View File

@ -135,10 +135,10 @@
#include <gtk/gtkcustomfilter.h>
#include <gtk/gtkflattenlistmodel.h>
#include <gtk/gtkflowbox.h>
#include <gtk/gtkfontbutton.h>
#include <gtk/gtkfontchooser.h>
#include <gtk/gtkfontchooserdialog.h>
#include <gtk/gtkfontchooserwidget.h>
#include <gtk/deprecated/gtkfontbutton.h>
#include <gtk/deprecated/gtkfontchooser.h>
#include <gtk/deprecated/gtkfontchooserdialog.h>
#include <gtk/deprecated/gtkfontchooserwidget.h>
#include <gtk/gtkfontdialog.h>
#include <gtk/gtkfontdialogbutton.h>
#include <gtk/gtkframe.h>

View File

@ -22,8 +22,8 @@
#include <string.h>
#include "gtkfontchooserdialogprivate.h"
#include "gtkfontchooser.h"
#include "gtkfontchooserwidget.h"
#include "deprecated/gtkfontchooser.h"
#include "deprecated/gtkfontchooserwidget.h"
#include "gtkfontchooserwidgetprivate.h"
#include "gtkfontchooserutils.h"
#include "gtkbox.h"
@ -38,6 +38,8 @@
#include "gtkactionable.h"
#include "gtkeventcontrollerkey.h"
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
typedef struct _GtkFontChooserDialogClass GtkFontChooserDialogClass;
struct _GtkFontChooserDialog
@ -72,6 +74,8 @@ struct _GtkFontChooserDialogClass
* The `GtkFontChooserDialog` implementation of the `GtkBuildable`
* interface exposes the buttons with the names select_button
* and cancel_button.
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] instead
*/
static void gtk_font_chooser_dialog_buildable_interface_init (GtkBuildableIface *iface);
@ -288,6 +292,8 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *dialog)
* Creates a new `GtkFontChooserDialog`.
*
* Returns: a new `GtkFontChooserDialog`
*
* Deprecated: 4.10: Use [class@Gtk.FontDialog] instead
*/
GtkWidget*
gtk_font_chooser_dialog_new (const char *title,

View File

@ -18,7 +18,7 @@
#ifndef __GTK_FONT_CHOOSER_DIALOG_PRIVATE_H__
#define __GTK_FONT_CHOOSER_DIALOG_PRIVATE_H__
#include "gtkfontchooserdialog.h"
#include "deprecated/gtkfontchooserdialog.h"
#include "gtkfilter.h"
G_BEGIN_DECLS

View File

@ -26,6 +26,8 @@
#include "gtkfontchooserutils.h"
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static GtkFontChooser *
get_delegate (GtkFontChooser *receiver)
{

View File

@ -25,7 +25,7 @@
#ifndef __GTK_FONT_CHOOSER_UTILS_H__
#define __GTK_FONT_CHOOSER_UTILS_H__
#include "gtkfontchooserprivate.h"
#include "deprecated/gtkfontchooserprivate.h"
G_BEGIN_DECLS

View File

@ -21,7 +21,7 @@
#include <glib/gprintf.h>
#include <string.h>
#include "gtkfontchooserwidget.h"
#include "deprecated/gtkfontchooserwidget.h"
#include "gtkfontchooserwidgetprivate.h"
#include "gtkadjustment.h"
@ -34,7 +34,7 @@
#include "gtkfilter.h"
#include "gtkframe.h"
#include "gtkgrid.h"
#include "gtkfontchooser.h"
#include "deprecated/gtkfontchooser.h"
#include "gtkfontchooserutils.h"
#include <glib/gi18n-lib.h>
#include "gtklabel.h"
@ -70,6 +70,8 @@
#include "language-names.h"
#include "open-type-layout.h"
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/**
* GtkFontChooserWidget:
*
@ -90,6 +92,8 @@
* # CSS nodes
*
* `GtkFontChooserWidget` has a single CSS node with name fontchooser.
*
* Deprecated: 4.10: Direct use of `GtkFontChooserWidget` is deprecated.
*/
typedef struct _GtkFontChooserWidgetClass GtkFontChooserWidgetClass;
@ -1299,6 +1303,8 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *self)
* Creates a new `GtkFontChooserWidget`.
*
* Returns: a new `GtkFontChooserWidget`
*
* Deprecated: 4.10: Direct use of `GtkFontChooserWidget` is deprecated.
*/
GtkWidget *
gtk_font_chooser_widget_new (void)

View File

@ -18,7 +18,7 @@
#ifndef __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__
#define __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__
#include "gtkfontchooserwidget.h"
#include "deprecated/gtkfontchooserwidget.h"
#include "gtkfilter.h"
G_BEGIN_DECLS

View File

@ -21,7 +21,7 @@
#include "gtkfontdialog.h"
#include "gtkfontchooser.h"
#include "deprecated/gtkfontchooser.h"
#include "gtkfontchooserdialogprivate.h"
#include "gtkbutton.h"
#include "gtkdialogerror.h"
@ -502,6 +502,7 @@ typedef struct
PangoLanguage *language;
} FontResult;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static void
response_cb (GTask *task,
int response)
@ -568,6 +569,7 @@ response_cb (GTask *task,
g_object_unref (task);
}
G_GNUC_END_IGNORE_DEPRECATIONS
static void
dialog_response (GtkDialog *dialog,
@ -577,6 +579,7 @@ dialog_response (GtkDialog *dialog,
response_cb (task, response);
}
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static GtkWidget *
create_font_chooser (GtkFontDialog *self,
GtkWindow *parent,
@ -605,6 +608,7 @@ create_font_chooser (GtkFontDialog *self,
return window;
}
G_GNUC_END_IGNORE_DEPRECATIONS
/* }}} */
/* {{{ Async API */

View File

@ -235,8 +235,6 @@ gtk_public_sources = files([
'gtkfixedlayout.c',
'gtkflattenlistmodel.c',
'gtkflowbox.c',
'gtkfontbutton.c',
'gtkfontchooser.c',
'gtkfontchooserdialog.c',
'gtkfontchooserutils.c',
'gtkfontchooserwidget.c',
@ -494,10 +492,6 @@ gtk_public_headers = files([
'gtkfixedlayout.h',
'gtkflattenlistmodel.h',
'gtkflowbox.h',
'gtkfontbutton.h',
'gtkfontchooser.h',
'gtkfontchooserdialog.h',
'gtkfontchooserwidget.h',
'gtkfontdialog.h',
'gtkfontdialogbutton.h',
'gtkframe.h',

View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static gboolean
monospace_filter (const PangoFontFamily *family,
const PangoFontFace *face,