Commit cb916f27 authored by Cosimo Cecchi's avatar Cosimo Cecchi
Browse files

Merge branch 'master' into open-with-dialog

Conflicts:
	docs/reference/gtk/gtk3-sections.txt
	gtk/gtk.symbols
parents 5f942b12 92232455
Overview of Changes from GTK+ 2.91.4 to 2.91.5
==============================================
* GtkSwitch: a new widget that provides switch-like on/off functionality
* Deprecations and cleanups:
- GtkCallbackMarshal and GtkFunction have been deprecated
- gtk_init_add has been removed
- The ::size-request signal has been removed
- GtkRuler has been removed
* The default value for the GtkBox::fill property has been changed
back to TRUE
* Bugs fixed:
613942 Deprecate GtkRuler, GtkVruler and GtkHRuler
629955 Deprecate / remove gtk_main and gtk_init_add / remove* API
633324 Stop invoking size-request completely
633896 Printing: Use XDG_DOCUMENTS_DIR as the default location...
634474 infinite loop in gtk_icon_view_accessible_set_adjustment
634558 Selecting "Search" should focus text box for keyboard entry
634592 GtkNotebook doesn't expand (in a typical GtkDialog)
634697 gdk: Add XSetting for "gtk-cursor-blink-timeout"
634821 Fix a BadMatch when create an icon pixmap for an ARGB visual
634987 add a switch widget
635175 Leak in gtk_plug_realize
635253 GtkRadioButton constructors don't mark group as "allow-none"
635307 iconcache: Ensure we don't lose data on power loss
635380 gdk_event_apply_filters is unsafe against changes in filter list
635588 clicking URL to be opened freezes the application for 3-5 seconds
635693 Bad pointer grab bug with GtkMenu/GtkComboBox
635879 Change the gdk_rgba_parse() function to be usable from bindings
* Updated translations:
Arabic
British English
Catalan
Czech
German
Hungarian
Indonesian
Norwegian bokmål
Romanian
Thai
Uyghur
Overview of Changes from GTK+ 2.91.3 to 2.91.4
==============================================
......
......@@ -10,7 +10,7 @@
m4_define([gtk_major_version], [2])
m4_define([gtk_minor_version], [91])
m4_define([gtk_micro_version], [5])
m4_define([gtk_micro_version], [6])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
......@@ -61,8 +61,8 @@ cflags_set=${CFLAGS+set}
AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2])
AM_MAINTAINER_MODE([enable])
# Support silent build rules, requires at least automake-1.11. Enable
# by either passing --enable-silent-rules to configure or passing V=0
# Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
......
......@@ -437,7 +437,26 @@ do_combobox (GtkWidget *do_widget)
gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
gtk_container_add (GTK_CONTAINER (combo), entry);
/* A combobox with string IDs */
frame = gtk_frame_new ("String IDs");
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 5);
gtk_container_add (GTK_CONTAINER (frame), box);
combo = gtk_combo_box_text_new ();
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
gtk_container_add (GTK_CONTAINER (box), combo);
entry = gtk_entry_new ();
g_object_bind_property (combo, "active-id",
entry, "text",
G_BINDING_BIDIRECTIONAL);
gtk_container_add (GTK_CONTAINER (box), entry);
}
if (!gtk_widget_get_visible (window))
......
......@@ -322,7 +322,8 @@ HTML_IMAGES = \
$(srcdir)/images/layout-tblr.png \
$(srcdir)/images/layout-tbrl.png \
$(srcdir)/images/window-default.png \
$(srcdir)/images/hello-world.png
$(srcdir)/images/hello-world.png \
$(srcdir)/images/switch.png
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk/html \
......
......@@ -97,6 +97,7 @@
<xi:include href="xml/gtklinkbutton.xml" />
<xi:include href="xml/gtkscalebutton.xml" />
<xi:include href="xml/gtkvolumebutton.xml" />
<xi:include href="xml/gtkswitch.xml" />
</chapter>
<chapter id="NumericEntry">
......@@ -287,13 +288,6 @@
<xi:include href="xml/gtksocket.xml" />
</chapter>
<chapter id="SpecialObjects">
<title>Special-purpose features</title>
<xi:include href="xml/gtkruler.xml" />
<xi:include href="xml/gtkhruler.xml" />
<xi:include href="xml/gtkvruler.xml" />
</chapter>
<chapter id="RecentDocuments">
<title>Recently Used Documents</title>
<xi:include href="xml/gtkrecentmanager.xml" />
......
......@@ -371,6 +371,8 @@ gtk_assistant_add_action_widget
gtk_assistant_remove_action_widget
gtk_assistant_update_buttons_state
gtk_assistant_commit
gtk_assistant_next_page
gtk_assistant_previous_page
<SUBSECTION Standard>
GtkAssistantClass
......@@ -417,6 +419,7 @@ GTK_ASPECT_FRAME_CLASS
GTK_IS_ASPECT_FRAME_CLASS
GTK_ASPECT_FRAME_GET_CLASS
<SUBSECTION Private>
GtkAspectFramePrivate
gtk_aspect_frame_get_type
</SECTION>
......@@ -437,6 +440,7 @@ GTK_BUTTON_BOX_CLASS
GTK_IS_BUTTON_BOX_CLASS
GTK_BUTTON_BOX_GET_CLASS
<SUBSECTION Private>
GtkButtonBoxPrivate
gtk_button_box_get_type
</SECTION>
......@@ -453,6 +457,7 @@ GTK_BIN_CLASS
GTK_IS_BIN_CLASS
GTK_BIN_GET_CLASS
<SUBSECTION Private>
GtkBinPrivate
gtk_bin_get_type
</SECTION>
......@@ -478,6 +483,7 @@ GTK_BOX_CLASS
GTK_IS_BOX_CLASS
GTK_BOX_GET_CLASS
<SUBSECTION Private>
GtkBoxPrivate
gtk_box_get_type
</SECTION>
......@@ -663,6 +669,7 @@ GTK_CHECK_MENU_ITEM_CLASS
GTK_IS_CHECK_MENU_ITEM_CLASS
GTK_CHECK_MENU_ITEM_GET_CLASS
<SUBSECTION Private>
GtkCheckMenuItemPrivate
gtk_check_menu_item_get_type
</SECTION>
......@@ -715,6 +722,7 @@ GTK_IS_HSV
GTK_IS_HSV_CLASS
GTK_HSV_GET_CLASS
<SUBSECTION Private>
GtkHSVPrivate
gtk_hsv_get_type
</SECTION>
......@@ -753,6 +761,7 @@ GTK_COLOR_SELECTION_CLASS
GTK_IS_COLOR_SELECTION_CLASS
GTK_COLOR_SELECTION_GET_CLASS
<SUBSECTION Private>
GtkColorSelectionPrivate
gtk_color_selection_get_type
</SECTION>
......@@ -770,6 +779,7 @@ GTK_COLOR_SELECTION_DIALOG_CLASS
GTK_IS_COLOR_SELECTION_DIALOG_CLASS
GTK_COLOR_SELECTION_DIALOG_GET_CLASS
<SUBSECTION Private>
GtkColorSelectionDialogPrivate
gtk_color_selection_dialog_get_type
</SECTION>
......@@ -791,6 +801,10 @@ gtk_combo_box_get_active
gtk_combo_box_set_active
gtk_combo_box_get_active_iter
gtk_combo_box_set_active_iter
gtk_combo_box_get_id_column
gtk_combo_box_set_id_column
gtk_combo_box_get_active_id
gtk_combo_box_set_active_id
gtk_combo_box_get_model
gtk_combo_box_set_model
gtk_combo_box_popup_for_device
......@@ -830,9 +844,12 @@ gtk_combo_box_get_type
GtkComboBoxText
gtk_combo_box_text_new
gtk_combo_box_text_new_with_entry
gtk_combo_box_text_append
gtk_combo_box_text_prepend
gtk_combo_box_text_insert
gtk_combo_box_text_append_text
gtk_combo_box_text_insert_text
gtk_combo_box_text_prepend_text
gtk_combo_box_text_insert_text
gtk_combo_box_text_remove
gtk_combo_box_text_remove_all
gtk_combo_box_text_get_active_text
......@@ -899,6 +916,7 @@ GTK_CONTAINER_CLASS
GTK_IS_CONTAINER_CLASS
GTK_CONTAINER_GET_CLASS
<SUBSECTION Private>
GtkContainerPrivate
gtk_container_get_type
</SECTION>
......@@ -934,6 +952,7 @@ GTK_DIALOG_CLASS
GTK_IS_DIALOG_CLASS
GTK_DIALOG_GET_CLASS
<SUBSECTION Private>
GtkDialogPrivate
gtk_dialog_get_type
</SECTION>
......@@ -1359,6 +1378,7 @@ GTK_FIXED_CLASS
GTK_IS_FIXED_CLASS
GTK_FIXED_GET_CLASS
<SUBSECTION Private>
GtkFixedPrivate
GtkFixedChild
gtk_fixed_get_type
</SECTION>
......@@ -1419,6 +1439,7 @@ GTK_FONT_SELECTION_CLASS
GTK_IS_FONT_SELECTION_CLASS
GTK_FONT_SELECTION_GET_CLASS
<SUBSECTION Private>
GtkFontSelectionPrivate
gtk_font_selection_get_type
</SECTION>
......@@ -1443,6 +1464,7 @@ GTK_FONT_SELECTION_DIALOG_CLASS
GTK_IS_FONT_SELECTION_DIALOG_CLASS
GTK_FONT_SELECTION_DIALOG_GET_CLASS
<SUBSECTION Private>
GtkFontSelectionDialogPrivate
gtk_font_selection_dialog_get_type
</SECTION>
......@@ -1467,6 +1489,7 @@ GTK_FRAME_CLASS
GTK_IS_FRAME_CLASS
GTK_FRAME_GET_CLASS
<SUBSECTION Private>
GtkFramePrivate
gtk_frame_get_type
</SECTION>
......@@ -1490,6 +1513,7 @@ GTK_HANDLE_BOX_CLASS
GTK_IS_HANDLE_BOX_CLASS
GTK_HANDLE_BOX_GET_CLASS
<SUBSECTION Private>
GtkHandleBoxPrivate
gtk_handle_box_get_type
</SECTION>
......@@ -1541,22 +1565,6 @@ GTK_HPANED_GET_CLASS
gtk_hpaned_get_type
</SECTION>
<SECTION>
<FILE>gtkhruler</FILE>
<TITLE>GtkHRuler</TITLE>
GtkHRuler
gtk_hruler_new
<SUBSECTION Standard>
GTK_HRULER
GTK_IS_HRULER
GTK_TYPE_HRULER
GTK_HRULER_CLASS
GTK_IS_HRULER_CLASS
GTK_HRULER_GET_CLASS
<SUBSECTION Private>
gtk_hruler_get_type
</SECTION>
<SECTION>
<FILE>gtkhscale</FILE>
<TITLE>GtkHScale</TITLE>
......@@ -1724,6 +1732,7 @@ GTK_IMAGE_CLASS
GTK_IS_IMAGE_CLASS
GTK_IMAGE_GET_CLASS
<SUBSECTION Private>
GtkImagePrivate
gtk_image_get_type
GtkImageIconSetData
GtkImageImageData
......@@ -1759,6 +1768,7 @@ GTK_IS_IMAGE_MENU_ITEM
GTK_IS_IMAGE_MENU_ITEM_CLASS
GTK_TYPE_IMAGE_MENU_ITEM
<SUBSECTION Private>
GtkImageMenuItemPrivate
gtk_image_menu_item_get_type
</SECTION>
......@@ -1805,6 +1815,7 @@ GTK_IM_CONTEXT_SIMPLE_CLASS
GTK_IS_IM_CONTEXT_SIMPLE_CLASS
GTK_IM_CONTEXT_SIMPLE_GET_CLASS
<SUBSECTION Private>
GtkIMContextSimplePrivate
gtk_im_context_simple_get_type
</SECTION>
......@@ -1845,6 +1856,7 @@ GTK_IS_INVISIBLE_CLASS
GTK_INVISIBLE_GET_CLASS
<SUBSECTION Private>
gtk_invisible_get_type
GtkInvisiblePrivate
</SECTION>
<SECTION>
......@@ -1904,6 +1916,7 @@ GTK_IS_LABEL_CLASS
GTK_LABEL_GET_CLASS
<SUBSECTION Private>
gtk_label_get_type
GtkLabelPrivate
GtkLabelSelectionInfo
</SECTION>
......@@ -1929,6 +1942,7 @@ GTK_LAYOUT_CLASS
GTK_IS_LAYOUT_CLASS
GTK_LAYOUT_GET_CLASS
<SUBSECTION Private>
GtkLayoutPrivate
gtk_layout_get_type
</SECTION>
......@@ -2466,6 +2480,7 @@ GTK_IS_RANGE_CLASS
GTK_RANGE_GET_CLASS
<SUBSECTION Private>
gtk_range_get_type
GtkRangePrivate
GtkRangeLayout
GtkRangeStepTimer
</SECTION>
......@@ -2687,28 +2702,6 @@ GtkRecentActionPrivate
gtk_recent_action_get_type
</SECTION>
<SECTION>
<FILE>gtkruler</FILE>
<TITLE>GtkRuler</TITLE>
GtkRuler
GtkRulerMetric
gtk_ruler_new
gtk_ruler_set_metric
gtk_ruler_set_range
gtk_ruler_get_metric
gtk_ruler_get_range
<SUBSECTION Standard>
GTK_RULER
GTK_IS_RULER
GTK_TYPE_RULER
GTK_RULER_CLASS
GTK_IS_RULER_CLASS
GTK_RULER_GET_CLASS
<SUBSECTION Private>
GtkRulerPrivate
gtk_ruler_get_type
</SECTION>
<SECTION>
<FILE>gtkscale</FILE>
<TITLE>GtkScale</TITLE>
......@@ -2770,6 +2763,12 @@ gtk_scrollable_get_hadjustment
gtk_scrollable_set_hadjustment
gtk_scrollable_get_vadjustment
gtk_scrollable_set_vadjustment
GtkScrollablePolicy
gtk_scrollable_get_hscroll_policy
gtk_scrollable_set_hscroll_policy
gtk_scrollable_get_vscroll_policy
gtk_scrollable_set_vscroll_policy
<SUBSECTION Standard>
GtkScrollableIface
......@@ -2833,6 +2832,7 @@ GTK_IS_SCROLLED_WINDOW_CLASS
GTK_SCROLLED_WINDOW_GET_CLASS
<SUBSECTION Private>
gtk_scrolled_window_get_type
GtkScrolledWindowPrivate
</SECTION>
<SECTION>
......@@ -2849,6 +2849,7 @@ GTK_IS_SEPARATOR_CLASS
GTK_SEPARATOR_GET_CLASS
<SUBSECTION Private>
gtk_separator_get_type
GtkSeparatorPrivate
</SECTION>
<SECTION>
......@@ -3546,6 +3547,7 @@ GTK_IS_TOGGLE_BUTTON_CLASS
GTK_TOGGLE_BUTTON_GET_CLASS
<SUBSECTION Private>
gtk_toggle_button_get_type
GtkToggleButtonPrivate
</SECTION>
<SECTION>
......@@ -4418,6 +4420,7 @@ GTK_CELL_RENDERER_CLASS
GTK_IS_CELL_RENDERER_CLASS
GTK_CELL_RENDERER_GET_CLASS
<SUBSECTION Private>
GtkCellRendererPrivate
gtk_cell_renderer_get_type
</SECTION>
......@@ -4453,6 +4456,7 @@ GTK_IS_CELL_RENDERER_COMBO_CLASS
GTK_CELL_RENDERER_COMBO_GET_CLASS
<SUBSECTION Private>
gtk_cell_renderer_combo_get_type
GtkCellRendererComboPrivate
</SECTION>
<SECTION>
......@@ -4503,6 +4507,7 @@ GTK_IS_CELL_RENDERER_PIXBUF_CLASS
GTK_CELL_RENDERER_PIXBUF_GET_CLASS
<SUBSECTION Private>
gtk_cell_renderer_pixbuf_get_type
GtkCellRendererPixbufPrivate
</SECTION>
<SECTION>
......@@ -4520,6 +4525,7 @@ GTK_IS_CELL_RENDERER_TEXT_CLASS
GTK_CELL_RENDERER_TEXT_GET_CLASS
<SUBSECTION Private>
gtk_cell_renderer_text_get_type
GtkCellRendererTextPrivate
</SECTION>
<SECTION>
......@@ -4543,6 +4549,7 @@ GTK_IS_CELL_RENDERER_TOGGLE_CLASS
GTK_CELL_RENDERER_TOGGLE_GET_CLASS
<SUBSECTION Private>
gtk_cell_renderer_toggle_get_type
GtkCellRendererTogglePrivate
</SECTION>
<SECTION>
......@@ -4578,6 +4585,7 @@ GTK_IS_CELL_RENDERER_ACCEL_CLASS
GTK_CELL_RENDERER_ACCEL_GET_CLASS
<SUBSECTION Private>
gtk_cell_renderer_accel_get_type
GtkCellRendererAccelPrivate
</SECTION>
<SECTION>
......@@ -4707,22 +4715,6 @@ gtk_vpaned_get_type
GtkPanedPrivate
</SECTION>
<SECTION>
<FILE>gtkvruler</FILE>
<TITLE>GtkVRuler</TITLE>
GtkVRuler
gtk_vruler_new
<SUBSECTION Standard>
GTK_VRULER
GTK_IS_VRULER
GTK_TYPE_VRULER
GTK_VRULER_CLASS
GTK_IS_VRULER_CLASS
GTK_VRULER_GET_CLASS
<SUBSECTION Private>
gtk_vruler_get_type
</SECTION>
<SECTION>
<FILE>gtkvscale</FILE>
<TITLE>GtkVScale</TITLE>
......@@ -5550,7 +5542,6 @@ GtkExpanderStyle
GtkIMPreeditStyle
GtkIMStatusStyle
GtkJustification
GtkMetricType
GtkMovementStep
GtkOrientation
GtkPackType
......@@ -5811,6 +5802,7 @@ GTK_IS_ICON_FACTORY_CLASS
GTK_TYPE_ICON_SET
GTK_TYPE_ICON_SOURCE
<SUBSECTION Private>
GtkIconFactoryPrivate
gtk_icon_factory_get_type
gtk_icon_set_get_type
gtk_icon_source_get_type
......@@ -6399,29 +6391,76 @@ gtk_grid_get_type
</SECTION>
<SECTION>
<FILE>gtkopenwithdialog</FILE>
<TITLE>GtkOpenWithDialog</TITLE>
GtkOpenWithDialog
GtkOpenWithDialogMode
gtk_open_with_dialog_new
gtk_open_with_dialog_new_for_content_type
gtk_open_with_dialog_get_mode
gtk_open_with_dialog_get_selected_application
gtk_open_with_dialog_set_show_set_as_default_button
gtk_open_with_dialog_get_show_set_as_default_button
gtk_open_with_dialog_set_show_other_applications
gtk_open_with_dialog_get_show_other_applications
<FILE>gtkswitch</FILE>
GtkSwitch
gtk_switch_new
gtk_switch_set_active
gtk_switch_get_active
<SUBSECTION Standard>
GtkSwitchClass
GTK_TYPE_SWITCH
GTK_SWITCH
GTK_SWITCH_CLASS
GTK_IS_SWITCH
GTK_IS_SWITCH_CLASS
GTK_SWITCH_GET_CLASS
<SUBSECTION Private>
GtkSwitchPrivate
gtk_switch_get_type
</SECTION>
<SECTION>
<FILE>gtkappchooserdialog</FILE>
<TITLE>GtkAppChooserDialog</TITLE>
GtkAppChooserDialog
gtk_app_chooser_dialog_new
gtk_app_chooser_dialog_new_for_content_type
gtk_app_chooser_dialog_get_widget
<SUBSECTION Standard>
GtkAppChooserDialogClass
GTK_TYPE_APP_CHOOSER_DIALOG
GTK_APP_CHOOSER_DIALOG
GTK_APP_CHOOSER_DIALOG_CLASS
GTK_IS_APP_CHOOSER_DIALOG
GTK_IS_APP_CHOOSER_DIALOG_CLASS
GTK_APP_CHOOSER_DIALOG_GET_CLASS
<SUBSECTION Private>
GtkAppChooserDialogPrivate
gtk_app_chooser_dialog_get_type
</SECTION>
<SECTION>
<FILE>gtkappchooserwidget</FILE>
<TITLE>GtkAppChooserWidget</TITLE>
GtkAppChooserWidget
gtk_app_chooser_widget_new
gtk_app_chooser_widget_set_show_default
gtk_app_chooser_widget_get_show_default
gtk_app_chooser_widget_set_show_recommended
gtk_app_chooser_widget_get_show_recommended
gtk_app_chooser_widget_set_show_fallback
gtk_app_chooser_widget_get_show_fallback
gtk_app_chooser_widget_set_show_other
gtk_app_chooser_widget_get_show_other
gtk_app_chooser_widget_set_show_all
gtk_app_chooser_widget_get_show_all
gtk_app_chooser_widget_set_default_text
gtk_app_chooser_widget_get_default_text
<SUBSECTION Standard>
GtkOpenWithDialogClass
GTK_TYPE_OPEN_WITH_DIALOG
GTK_OPEN_WITH_DIALOG
GTK_OPEN_WITH_DIALOG_CLASS
GTK_IS_OPEN_WITH_DIALOG
GTK_IS_OPEN_WITH_DIALOG_CLASS
GTK_OPEN_WITH_DIALOG_GET_CLASS
GtkAppChooserWidgetClass
GTK_TYPE_APP_CHOOSER_WIDGET
GTK_APP_CHOOSER_WIDGET
GTK_APP_CHOOSER_WIDGET_CLASS
GTK_IS_APP_CHOOSER_WIDGET
GTK_IS_APP_CHOOSER_WIDGET_CLASS
GTK_APP_CHOOSER_WIDGET_GET_CLASS
<SUBSECTION Private>
GtkOpenWithDialogPrivate
gtk_open_with_dialog_get_type
GtkAppChooserWidgetPrivate
gtk_app_chooser_widget_get_type
</SECTION>
......@@ -66,7 +66,6 @@ gtk_handle_box_get_type
gtk_hbox_get_type
gtk_hbutton_box_get_type
gtk_hpaned_get_type
gtk_hruler_get_type
gtk_hscale_get_type
gtk_hscrollbar_get_type
gtk_hseparator_get_type
......@@ -122,7 +121,6 @@ gtk_recent_chooser_dialog_get_type
gtk_recent_chooser_menu_get_type
gtk_recent_chooser_widget_get_type
gtk_recent_manager_get_type
gtk_ruler_get_type
gtk_scale_button_get_type
gtk_scale_get_type
gtk_scrollable_get_type
......@@ -138,6 +136,7 @@ gtk_spin_button_get_type
gtk_spinner_get_type
gtk_statusbar_get_type
gtk_status_icon_get_type
gtk_switch_get_type
gtk_style_get_type
gtk_table_get_type
gtk_tearoff_menu_item_get_type
......@@ -172,7 +171,6 @@ gtk_vbutton_box_get_type
gtk_viewport_get_type
gtk_volume_button_get_type
gtk_vpaned_get_type
gtk_vruler_get_type
gtk_vscale_get_type
gtk_vscrollbar_get_type
gtk_vseparator_get_type
......