AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add deprecation annotations for deprecated functions

Browse Source 
We define our own GDK_DEPRECATED[_FOR] macros for this
and allow it to be turned off by defining the
GDK_DISABLE_DEPRECATION_WARNINGS macro.
This commit is contained in:
Matthias Clasen 2011-10-11 15:03:46 -04:00
parent 8f078992fd
commit 9e0efc5022
25 changed files with 431 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -39,7 +39,7 @@ AC_CONFIG_AUX_DIR([build-aux])
m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
m4_define([glib_required_version], [2.29.14])
m4_define([glib_required_version], [2.31.0])
m4_define([pango_required_version], [1.29.0])
m4_define([atk_required_version], [2.1.5])
m4_define([cairo_required_version], [1.10.0])
@ -1673,6 +1673,20 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
G_BEGIN_DECLS
/* These macros are used to mark deprecated functions in GDK and
* GTK+ headers, and thus have to be exposed in installed headers.
* But please do *not* use them in other projects. Instead, use
* G_DEPRECATED or define your own wrappers around it.
*/
#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
#define GDK_DEPRECATED
#define GDK_DEPRECATED_FOR(f)
#else
#define GDK_DEPRECATED G_DEPRECATED
#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
#endif
_______EOF
cat >>$outfile <<_______EOF

6
gdk/gdkapplaunchcontext.h
View File

@ -41,9 +41,11 @@ G_BEGIN_DECLS
GType gdk_app_launch_context_get_type (void);
#ifndef GDK_DISABLE_DEPRECATED
GdkAppLaunchContext *gdk_app_launch_context_new (void) G_GNUC_DEPRECATED_FOR(gdk_display_get_app_launch_context);
GDK_DEPRECATED_FOR(gdk_display_get_app_launch_context)
GdkAppLaunchContext *gdk_app_launch_context_new (void);
GDK_DEPRECATED_FOR(gdk_display_get_app_launch_context)
void gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_display_get_app_launch_context);
GdkDisplay *display);
#endif
void gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
GdkScreen *screen);

6
gdk/gdkcursor.h
View File

@ -229,8 +229,10 @@ GdkCursor* gdk_cursor_new_from_name (GdkDisplay *display,
const gchar *name);
GdkDisplay* gdk_cursor_get_display (GdkCursor *cursor);
#ifndef GDK_DISABLE_DEPRECATED
GdkCursor* gdk_cursor_ref (GdkCursor *cursor) G_GNUC_DEPRECATED_FOR(g_object_ref);
void gdk_cursor_unref (GdkCursor *cursor) G_GNUC_DEPRECATED_FOR(g_object_unref);
GDK_DEPRECATED_FOR(g_object_ref)
GdkCursor * gdk_cursor_ref (GdkCursor *cursor);
GDK_DEPRECATED_FOR(g_object_unref)
void gdk_cursor_unref (GdkCursor *cursor);
#endif
GdkPixbuf* gdk_cursor_get_image (GdkCursor *cursor);
GdkCursorType gdk_cursor_get_cursor_type (GdkCursor *cursor);

21
gdk/gdkdisplay.h
View File

@ -53,11 +53,14 @@ GdkScreen * gdk_display_get_default_screen (GdkDisplay *display);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
GDK_DEPRECATED_FOR(gdk_device_ungrab)
void gdk_display_pointer_ungrab (GdkDisplay *display,
guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
guint32 time_);
GDK_DEPRECATED_FOR(gdk_device_ungrab)
void gdk_display_keyboard_ungrab (GdkDisplay *display,
guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_display_device_is_grabbed);
guint32 time_);
GDK_DEPRECATED_FOR(gdk_display_device_is_grabbed)
gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
@ -71,7 +74,8 @@ void gdk_display_close (GdkDisplay *display);
gboolean gdk_display_is_closed (GdkDisplay *display);
#ifndef GDK_DISABLE_DEPRECATED
GList * gdk_display_list_devices (GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_device_manager_list_devices);
GDK_DEPRECATED_FOR(gdk_device_manager_list_devices)
GList * gdk_display_list_devices (GdkDisplay *display);
#endif /* GDK_DISABLE_DEPRECATED */
GdkEvent* gdk_display_get_event (GdkDisplay *display);
@ -89,18 +93,21 @@ GdkDisplay *gdk_display_get_default (void);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
GDK_DEPRECATED_FOR(gdk_device_get_position)
void gdk_display_get_pointer (GdkDisplay *display,
GdkScreen **screen,
gint *x,
gint *y,
GdkModifierType *mask) G_GNUC_DEPRECATED_FOR(gdk_device_get_position);
GdkModifierType *mask);
GDK_DEPRECATED_FOR(gdk_device_get_window_at_position)
GdkWindow * gdk_display_get_window_at_pointer (GdkDisplay *display,
gint *win_x,
gint *win_y) G_GNUC_DEPRECATED_FOR(gdk_device_get_window_at_position);
gint *win_y);
GDK_DEPRECATED_FOR(gdk_device_warp)
void gdk_display_warp_pointer (GdkDisplay *display,
GdkScreen *screen,
gint x,
gint y) G_GNUC_DEPRECATED_FOR(gdk_device_warp);
gint y);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */

15
gdk/gdkmain.h
View File

@ -79,15 +79,17 @@ gchar* gdk_get_display (void);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
GDK_DEPRECATED_FOR(gdk_device_grab)
GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
gboolean owner_events,
GdkEventMask event_mask,
GdkWindow *confine_to,
GdkCursor *cursor,
guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_grab);
guint32 time_);
GDK_DEPRECATED_FOR(gdk_device_grab)
GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
gboolean owner_events,
guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_grab);
guint32 time_);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
@ -95,9 +97,12 @@ GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
void gdk_pointer_ungrab (guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
void gdk_keyboard_ungrab (guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
gboolean gdk_pointer_is_grabbed (void) G_GNUC_DEPRECATED_FOR(gdk_display_device_is_grabbed);
GDK_DEPRECATED_FOR(gdk_device_ungrab)
void gdk_pointer_ungrab (guint32 time_);
GDK_DEPRECATED_FOR(gdk_device_ungrab)
void gdk_keyboard_ungrab (guint32 time_);
GDK_DEPRECATED_FOR(gdk_display_device_is_grabbed)
gboolean gdk_pointer_is_grabbed (void);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */

6
gdk/gdkwindow.h
View File

@ -503,8 +503,9 @@ GdkVisual * gdk_window_get_visual (GdkWindow *window);
GdkScreen * gdk_window_get_screen (GdkWindow *window);
GdkDisplay * gdk_window_get_display (GdkWindow *window);
#ifndef GDK_MULTIDEVICE_SAFE
GDK_DEPRECATED_FOR(gdk_device_get_window_at_position)
GdkWindow* gdk_window_at_pointer (gint *win_x,
gint *win_y) G_GNUC_DEPRECATED_FOR(gdk_device_get_window_at_position);
gint *win_y);
#endif /* GDK_MULTIDEVICE_SAFE */
void gdk_window_show (GdkWindow *window);
void gdk_window_hide (GdkWindow *window);
@ -710,10 +711,11 @@ void gdk_window_get_frame_extents (GdkWindow *window,
GdkRectangle *rect);
#ifndef GDK_MULTIDEVICE_SAFE
GDK_DEPRECATED_FOR(gdk_window_get_device_position)
GdkWindow * gdk_window_get_pointer (GdkWindow *window,
gint *x,
gint *y,
GdkModifierType *mask) G_GNUC_DEPRECATED_FOR(gdk_window_get_device_position);
GdkModifierType *mask);
#endif /* GDK_MULTIDEVICE_SAFE */
GdkWindow * gdk_window_get_device_position (GdkWindow *window,
GdkDevice *device,

4
gtk/gtkassistant.h
View File

@ -157,14 +157,18 @@ const gchar * gtk_assistant_get_page_title (GtkAssistant
GtkWidget *page);
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GDK_DEPRECATED
void gtk_assistant_set_page_header_image (GtkAssistant *assistant,
GtkWidget *page,
GdkPixbuf *pixbuf);
GDK_DEPRECATED
GdkPixbuf *gtk_assistant_get_page_header_image (GtkAssistant *assistant,
GtkWidget *page);
GDK_DEPRECATED
void gtk_assistant_set_page_side_image (GtkAssistant *assistant,
GtkWidget *page,
GdkPixbuf *pixbuf);
GDK_DEPRECATED
GdkPixbuf *gtk_assistant_get_page_side_image (GtkAssistant *assistant,
GtkWidget *page);
#endif

1
gtk/gtkbindings.h
View File

@ -181,6 +181,7 @@ void gtk_binding_entry_remove (GtkBindingSet *binding_set,
GdkModifierType modifiers);
#ifndef GTK_DISABLE_DEPRECATED
GDK_DEPRECATED
void gtk_binding_set_add_path (GtkBindingSet *binding_set,
GtkPathType path_type,
const gchar *path_pattern,

10
gtk/gtkbutton.h
View File

@ -81,13 +81,15 @@ GtkWidget* gtk_button_new (void);
GtkWidget* gtk_button_new_with_label (const gchar *label);
GtkWidget* gtk_button_new_from_stock (const gchar *stock_id);
GtkWidget* gtk_button_new_with_mnemonic (const gchar *label);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_button_pressed (GtkButton *button);
void gtk_button_released (GtkButton *button);
#endif
void gtk_button_clicked (GtkButton *button);
#ifndef GTK_DISABLE_DEPRECATED
GDK_DEPRECATED
void gtk_button_pressed (GtkButton *button);
GDK_DEPRECATED
void gtk_button_released (GtkButton *button);
GDK_DEPRECATED
void gtk_button_enter (GtkButton *button);
GDK_DEPRECATED
void gtk_button_leave (GtkButton *button);
#endif

13
gtk/gtkcellrenderer.h
View File

@ -189,13 +189,14 @@ void gtk_cell_renderer_get_aligned_area (GtkCellRend
GdkRectangle *aligned_area);
#ifndef GTK_DISABLE_DEPRECATED
GDK_DEPRECATED_FOR(gtk_cell_renderer_get_preferred_size)
void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
GtkWidget *widget,
const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
#endif
void gtk_cell_renderer_render (GtkCellRenderer *cell,
cairo_t *cr,

1
gtk/gtkcellview.h
View File

@ -87,6 +87,7 @@ void gtk_cell_view_set_fit_model (GtkCellView *cell_v
gboolean fit_model);
#ifndef GTK_DISABLE_DEPRECATED
GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
gboolean gtk_cell_view_get_size_of_row (GtkCellView *cell_view,
GtkTreePath *path,
GtkRequisition *requisition);

39
gtk/gtkfontsel.h
View File

@ -12,7 +12,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@ -114,23 +114,36 @@ struct _GtkFontSelectionDialogClass
* see the comments in the GtkFontSelectionDialog functions.
*****************************************************************************/
GType gtk_font_selection_get_type (void) G_GNUC_CONST;
GType gtk_font_selection_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_new (void);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_family_list (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_face_list (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_size_entry (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_size_list (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_preview_entry (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
PangoFontFamily *
gtk_font_selection_get_family (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
PangoFontFace *
gtk_font_selection_get_face (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
gint gtk_font_selection_get_size (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
gchar* gtk_font_selection_get_font_name (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
const gchar *fontname);
GDK_DEPRECATED_FOR(GtkFontChooser)
const gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
const gchar *text);
@ -140,11 +153,15 @@ void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
* GtkFontSelection.
*****************************************************************************/
GType gtk_font_selection_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_font_selection_dialog_new (const gchar *title);
GType gtk_font_selection_dialog_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_new (const gchar *title);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_get_ok_button (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_get_cancel_button (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_get_font_selection (GtkFontSelectionDialog *fsd);
/* This returns the X Logical Font Description fontname, or NULL if no font
@ -152,24 +169,28 @@ GtkWidget *gtk_font_selection_dialog_get_font_selection (GtkFontSelectionDialog
have been loaded OK. You should call gtk_font_selection_dialog_get_font()
to see if it has been loaded OK.
You should g_free() the returned font name after you're done with it. */
gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd);
/* This sets the currently displayed font. It should be a valid X Logical
Font Description font name (anything else will be ignored), e.g.
"-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*"
"-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*"
It returns TRUE on success. */
GDK_DEPRECATED_FOR(GtkFontChooser)
gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
const gchar *fontname);
const gchar *fontname);
/* This returns the text in the preview entry. You should copy the returned
text if you need it. */
GDK_DEPRECATED_FOR(GtkFontChooser)
const gchar*
gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd);
/* This sets the text in the preview entry. It will be copied by the entry,
so there's no need to g_strdup() it first. */
void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
const gchar *text);
GDK_DEPRECATED_FOR(GtkFontChooser)
void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
const gchar *text);
#endif /* GTK_DISABLE_DEPRECATED */

1
gtk/gtkhbbox.h
View File

@ -61,6 +61,7 @@ struct _GtkHButtonBoxClass
GType gtk_hbutton_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_button_box_new)
GtkWidget* gtk_hbutton_box_new (void);
G_END_DECLS

1
gtk/gtkhbox.h
View File

@ -62,6 +62,7 @@ struct _GtkHBoxClass
GType gtk_hbox_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_box_new)
GtkWidget * gtk_hbox_new (gboolean homogeneous,
gint spacing);

1
gtk/gtkhpaned.h
View File

@ -60,6 +60,7 @@ struct _GtkHPanedClass
GType gtk_hpaned_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_paned_new)
GtkWidget * gtk_hpaned_new (void);
G_END_DECLS

2
gtk/gtkhscale.h
View File

@ -61,7 +61,9 @@ struct _GtkHScaleClass
GType gtk_hscale_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_scale_new)
GtkWidget* gtk_hscale_new (GtkAdjustment *adjustment);
GDK_DEPRECATED_FOR(gtk_scale_new_with_range)
GtkWidget* gtk_hscale_new_with_range (gdouble min,
gdouble max,
gdouble step);

1
gtk/gtkhscrollbar.h
View File

@ -62,6 +62,7 @@ struct _GtkHScrollbarClass
GType gtk_hscrollbar_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_scrollbar_new)
GtkWidget* gtk_hscrollbar_new (GtkAdjustment *adjustment);

1
gtk/gtkhseparator.h
View File

@ -61,6 +61,7 @@ struct _GtkHSeparatorClass
GType gtk_hseparator_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_separator_new)
GtkWidget* gtk_hseparator_new (void);

1
gtk/gtkiconfactory.h
View File

@ -125,6 +125,7 @@ GtkIconSet* gtk_icon_set_copy (GtkIconSet *icon_set);
/* Get one of the icon variants in the set, creating the variant if
* necessary.
*/
GDK_DEPRECATED_FOR(gtk_icon_set_render_icon_pixbuf)
GdkPixbuf* gtk_icon_set_render_icon (GtkIconSet *icon_set,
GtkStyle *style,
GtkTextDirection direction,

1
gtk/gtkicontheme.h
View File

@ -212,6 +212,7 @@ GdkPixbuf * gtk_icon_info_load_symbolic_for_context (GtkIconInfo
gboolean *was_symbolic,
GError **error);
#ifndef GTK_DISABLE_DEPRECATED
GDK_DEPRECATED_FOR(gtk_icon_info_load_symbol_for_context)
GdkPixbuf * gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info,
GtkStyle *style,
GtkStateType state,

9
gtk/gtklayout.h
View File

@ -95,13 +95,16 @@ void gtk_layout_get_size (GtkLayout *layout,
guint *height);
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout *layout);
GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout *layout);
GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
void gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment);
GtkAdjustment *adjustment);
GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
void gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment);
GtkAdjustment *adjustment);
#endif

2
gtk/gtkmenuitem.h
View File

@ -105,8 +105,10 @@ void gtk_menu_item_toggle_size_request (GtkMenuItem *menu_item,
void gtk_menu_item_toggle_size_allocate (GtkMenuItem *menu_item,
gint allocation);
#ifndef GTK_DISABLE_DEPRECATED
GDK_DEPRECATED
void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item,
gboolean right_justified);
GDK_DEPRECATED
gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item);
#endif /* GTK_DISABLE_DEPRECATED */
void gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,

92
gtk/gtkrc.h
View File

@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@ -51,10 +51,10 @@ typedef struct _GtkRcStyleClass GtkRcStyleClass;
typedef enum
{
GTK_RC_FG = 1 << 0,
GTK_RC_BG = 1 << 1,
GTK_RC_TEXT = 1 << 2,
GTK_RC_BASE = 1 << 3
GTK_RC_FG = 1 << 0,
GTK_RC_BG = 1 << 1,
GTK_RC_TEXT = 1 << 2,
GTK_RC_BASE = 1 << 3
} GtkRcFlags;
/**
@ -102,7 +102,7 @@ struct _GtkRcStyle
GSList *icon_factories;
guint engine_specified : 1; /* The RC file specified the engine */
guint engine_specified : 1; /* The RC file specified the engine */
};
struct _GtkRcStyleClass
@ -121,14 +121,14 @@ struct _GtkRcStyleClass
* the token it expected but didn't get.
*/
guint (*parse) (GtkRcStyle *rc_style,
GtkSettings *settings,
GScanner *scanner);
GtkSettings *settings,
GScanner *scanner);
/* Combine RC style data from src into dest. If overridden, this
* function should chain to the parent.
*/
void (*merge) (GtkRcStyle *dest,
GtkRcStyle *src);
GtkRcStyle *src);
/* Create an empty style suitable to this RC style
*/
@ -149,37 +149,54 @@ gboolean _gtk_rc_match_widget_class (GSList *list,
gchar *path_reversed);
#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
void gtk_rc_add_default_file (const gchar *filename);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_rc_add_default_file (const gchar *filename);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_rc_set_default_files (gchar **filenames);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar** gtk_rc_get_default_files (void);
GtkStyle* gtk_rc_get_style (GtkWidget *widget);
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkStyle* gtk_rc_get_style (GtkWidget *widget);
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkStyle* gtk_rc_get_style_by_paths (GtkSettings *settings,
const char *widget_path,
const char *class_path,
GType type);
const char *widget_path,
const char *class_path,
GType type);
GDK_DEPRECATED_FOR(GtkStyleContext)
gboolean gtk_rc_reparse_all_for_settings (GtkSettings *settings,
gboolean force_load);
gboolean force_load);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_rc_reset_styles (GtkSettings *settings);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar* gtk_rc_find_pixmap_in_path (GtkSettings *settings,
GScanner *scanner,
const gchar *pixmap_file);
GScanner *scanner,
const gchar *pixmap_file);
void gtk_rc_parse (const gchar *filename);
void gtk_rc_parse_string (const gchar *rc_string);
gboolean gtk_rc_reparse_all (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_rc_parse (const gchar *filename);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_rc_parse_string (const gchar *rc_string);
GDK_DEPRECATED_FOR(GtkStyleContext)
gboolean gtk_rc_reparse_all (void);
GType gtk_rc_style_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkRcStyle* gtk_rc_style_new (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkRcStyle* gtk_rc_style_copy (GtkRcStyle *orig);
gchar* gtk_rc_find_module_in_path (const gchar *module_file);
gchar* gtk_rc_get_theme_dir (void);
gchar* gtk_rc_get_module_dir (void);
gchar* gtk_rc_get_im_module_path (void);
gchar* gtk_rc_get_im_module_file (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar* gtk_rc_find_module_in_path (const gchar *module_file);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar* gtk_rc_get_theme_dir (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar* gtk_rc_get_module_dir (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar* gtk_rc_get_im_module_path (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
gchar* gtk_rc_get_im_module_file (void);
/* private functions/definitions */
@ -276,16 +293,21 @@ typedef enum {
GTK_RC_TOKEN_LAST
} GtkRcTokenType;
GScanner* gtk_rc_scanner_new (void);
guint gtk_rc_parse_color (GScanner *scanner,
GdkColor *color);
guint gtk_rc_parse_color_full (GScanner *scanner,
GDK_DEPRECATED_FOR(GtkStyleContext)
GScanner* gtk_rc_scanner_new (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
guint gtk_rc_parse_color (GScanner *scanner,
GdkColor *color);
GDK_DEPRECATED_FOR(GtkStyleContext)
guint gtk_rc_parse_color_full (GScanner *scanner,
GtkRcStyle *style,
GdkColor *color);
guint gtk_rc_parse_state (GScanner *scanner,
GtkStateType *state);
guint gtk_rc_parse_priority (GScanner *scanner,
GtkPathPriorityType *priority);
GdkColor *color);
GDK_DEPRECATED_FOR(GtkStyleContext)
guint gtk_rc_parse_state (GScanner *scanner,
GtkStateType *state);
GDK_DEPRECATED_FOR(GtkStyleContext)
guint gtk_rc_parse_priority (GScanner *scanner,
GtkPathPriorityType *priority);
#endif

480
gtk/gtkstyle.h
View File

@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@ -58,8 +58,8 @@ typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkRcProperty GtkRcProperty;
typedef struct _GtkSettings GtkSettings;
typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
const GString *rc_string,
GValue *property_value);
const GString *rc_string,
GValue *property_value);
/**
* GTK_STYLE_ATTACHED:
@ -67,7 +67,7 @@ typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
*
* Returns whether the style is attached to a window.
*/
#define GTK_STYLE_ATTACHED(style) (GTK_STYLE (style)->attach_count > 0)
#define GTK_STYLE_ATTACHED(style) (GTK_STYLE (style)->attach_count > 0)
struct _GtkStyle
{
@ -82,7 +82,7 @@ struct _GtkStyle
GdkColor mid[5];
GdkColor text[5];
GdkColor base[5];
GdkColor text_aa[5]; /* Halfway between text/base */
GdkColor text_aa[5]; /* Halfway between text/base */
GdkColor black;
GdkColor white;
@ -101,10 +101,10 @@ struct _GtkStyle
PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
/* the RcStyle from which this style was created */
GtkRcStyle *rc_style;
GtkRcStyle *rc_style;
GSList *styles; /* of type GtkStyle* */
GArray *property_cache;
GSList *styles; /* of type GtkStyle* */
GArray *property_cache;
GSList *icon_factories; /* of type GtkIconFactory* */
};
@ -126,7 +126,7 @@ struct _GtkStyleClass
/* Make style an exact duplicate of src.
*/
void (*copy) (GtkStyle *style,
GtkStyle *src);
GtkStyle *src);
/* Create an empty style of the same type as this style.
* The default implementation, which does
@ -139,11 +139,11 @@ struct _GtkStyleClass
* should chain to the parent implementation.
*/
void (*init_from_rc) (GtkStyle *style,
GtkRcStyle *rc_style);
GtkRcStyle *rc_style);
void (*set_background) (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type);
GdkWindow *window,
GtkStateType state_type);
GdkPixbuf * (* render_icon) (GtkStyle *style,
@ -157,210 +157,210 @@ struct _GtkStyleClass
/* Drawing functions
*/
void (*draw_hline) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint x1,
gint x2,
gint y);
void (*draw_vline) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint y1_,
gint y2_,
gint x);
void (*draw_shadow) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_arrow) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
GtkArrowType arrow_type,
gboolean fill,
gint x,
gint y,
gint width,
gint height);
void (*draw_diamond) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_box) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_flat_box) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_check) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_option) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_tab) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_shadow_gap) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
void (*draw_box_gap) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
void (*draw_extension) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkPositionType gap_side);
void (*draw_focus) (GtkStyle *style,
cairo_t *cr,
void (*draw_hline) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_slider) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkOrientation orientation);
void (*draw_handle) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkOrientation orientation);
GtkWidget *widget,
const gchar *detail,
gint x1,
gint x2,
gint y);
void (*draw_vline) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint y1_,
gint y2_,
gint x);
void (*draw_shadow) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_arrow) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
GtkArrowType arrow_type,
gboolean fill,
gint x,
gint y,
gint width,
gint height);
void (*draw_diamond) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_box) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_flat_box) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_check) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_option) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_tab) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_shadow_gap) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
void (*draw_box_gap) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
void (*draw_extension) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkPositionType gap_side);
void (*draw_focus) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height);
void (*draw_slider) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkOrientation orientation);
void (*draw_handle) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkShadowType shadow_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
gint width,
gint height,
GtkOrientation orientation);
void (*draw_expander) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
void (*draw_expander) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
GtkExpanderStyle expander_style);
void (*draw_layout) (GtkStyle *style,
void (*draw_layout) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
gboolean use_text,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
GtkStateType state_type,
gboolean use_text,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
PangoLayout *layout);
void (*draw_resize_grip) (GtkStyle *style,
void (*draw_resize_grip) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
GdkWindowEdge edge,
gint x,
gint y,
gint width,
gint height);
void (*draw_spinner) (GtkStyle *style,
gint x,
gint y,
gint width,
gint height);
void (*draw_spinner) (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
guint step,
gint x,
gint y,
gint width,
gint height);
GtkStateType state_type,
GtkWidget *widget,
const gchar *detail,
guint step,
gint x,
gint y,
gint width,
gint height);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
@ -379,29 +379,38 @@ struct _GtkStyleClass
#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
GType gtk_style_get_type (void) G_GNUC_CONST;
GtkStyle* gtk_style_new (void);
GtkStyle* gtk_style_copy (GtkStyle *style);
GtkStyle* gtk_style_attach (GtkStyle *style,
GdkWindow *window) G_GNUC_WARN_UNUSED_RESULT;
void gtk_style_detach (GtkStyle *style);
void gtk_style_set_background (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type);
void gtk_style_apply_default_background (GtkStyle *style,
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkStyle* gtk_style_new (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkStyle* gtk_style_copy (GtkStyle *style);
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkStyle* gtk_style_attach (GtkStyle *style,
GdkWindow *window);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_style_detach (GtkStyle *style);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_style_set_background (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_style_apply_default_background (GtkStyle *style,
cairo_t *cr,
GdkWindow *window,
GtkStateType state_type,
gint x,
gint y,
gint width,
gint height);
GdkWindow *window,
GtkStateType state_type,
gint x,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkIconSet* gtk_style_lookup_icon_set (GtkStyle *style,
const gchar *stock_id);
GDK_DEPRECATED_FOR(GtkStyleContext)
gboolean gtk_style_lookup_color (GtkStyle *style,
const gchar *color_name,
GdkColor *color);
GDK_DEPRECATED_FOR(GtkStyleContext)
GdkPixbuf* gtk_style_render_icon (GtkStyle *style,
const GtkIconSource *source,
GtkTextDirection direction,
@ -410,6 +419,7 @@ GdkPixbuf* gtk_style_render_icon (GtkStyle *style,
GtkWidget *widget,
const gchar *detail);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_hline (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -418,6 +428,7 @@ void gtk_paint_hline (GtkStyle *style,
gint x1,
gint x2,
gint y);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_vline (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -426,6 +437,7 @@ void gtk_paint_vline (GtkStyle *style,
gint y1_,
gint y2_,
gint x);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_shadow (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -436,6 +448,7 @@ void gtk_paint_shadow (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_arrow (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -448,6 +461,7 @@ void gtk_paint_arrow (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_diamond (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -458,6 +472,7 @@ void gtk_paint_diamond (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_box (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -468,6 +483,7 @@ void gtk_paint_box (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_flat_box (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -478,6 +494,7 @@ void gtk_paint_flat_box (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_check (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -488,6 +505,7 @@ void gtk_paint_check (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_option (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -498,6 +516,7 @@ void gtk_paint_option (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_tab (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -508,6 +527,7 @@ void gtk_paint_tab (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_shadow_gap (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -521,6 +541,7 @@ void gtk_paint_shadow_gap (GtkStyle *style,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_box_gap (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -534,6 +555,7 @@ void gtk_paint_box_gap (GtkStyle *style,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_extension (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -545,6 +567,7 @@ void gtk_paint_extension (GtkStyle *style,
gint width,
gint height,
GtkPositionType gap_side);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_focus (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -554,6 +577,7 @@ void gtk_paint_focus (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_slider (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -565,6 +589,7 @@ void gtk_paint_slider (GtkStyle *style,
gint width,
gint height,
GtkOrientation orientation);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_handle (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -576,6 +601,7 @@ void gtk_paint_handle (GtkStyle *style,
gint width,
gint height,
GtkOrientation orientation);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_expander (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -584,6 +610,7 @@ void gtk_paint_expander (GtkStyle *style,
gint x,
gint y,
GtkExpanderStyle expander_style);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_layout (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -593,6 +620,7 @@ void gtk_paint_layout (GtkStyle *style,
gint x,
gint y,
PangoLayout *layout);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_resize_grip (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -603,6 +631,7 @@ void gtk_paint_resize_grip (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_paint_spinner (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
@ -614,14 +643,17 @@ void gtk_paint_spinner (GtkStyle *style,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_style_get_style_property (GtkStyle *style,
GType widget_type,
const gchar *property_name,
GValue *value);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_style_get_valist (GtkStyle *style,
GType widget_type,
const gchar *first_property_name,
va_list var_args);
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_style_get (GtkStyle *style,
GType widget_type,
const gchar *first_property_name,
@ -631,7 +663,7 @@ void gtk_style_get (GtkStyle *style,
/* --- private API --- */
GtkStyle* _gtk_style_new_for_path (GdkScreen *screen,
GtkWidgetPath *path);
GtkWidgetPath *path);
void _gtk_style_shade (const GdkColor *a,
GdkColor *b,
gdouble k);

1
gtk/gtkvbox.h
View File

@ -62,6 +62,7 @@ struct _GtkVBoxClass
GType gtk_vbox_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_box_new)
GtkWidget * gtk_vbox_new (gboolean homogeneous,
gint spacing);