wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 888863 - Port GTK2 to GTK3 - entry combo box update. r=karlt

Browse Source
This commit is contained in:
Martin Stransky 2013-07-15 09:12:41 -04:00
parent e79e36b645
commit 5b6c5c5aa2
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
widget/gtk2/gtk3drawing.c
View File

@ -312,7 +312,7 @@ ensure_combo_box_widgets()
if (gComboBoxButtonWidget) {
/* Get the widgets inside the Button */
buttonChild = gtk_bin_get_child(GTK_BIN(gComboBoxButtonWidget));
if (GTK_IS_HBOX(buttonChild)) {
if (GTK_IS_BOX(buttonChild)) {
/* appears-as-list = FALSE, cell-view = TRUE; the button
* contains an hbox. This hbox is there because the ComboBox
* needs to place a cell renderer, a separator, and an arrow in
@ -401,7 +401,7 @@ ensure_combo_box_entry_widgets()
/* Create a ComboBoxEntry if needed */
if (!gComboBoxEntryWidget) {
gComboBoxEntryWidget = NULL; /* TODO - gtk_combo_box_entry_new();*/
gComboBoxEntryWidget = gtk_combo_box_new_with_entry();
setup_widget_prototype(gComboBoxEntryWidget);
}
@ -418,14 +418,11 @@ ensure_combo_box_entry_widgets()
if (gComboBoxEntryButtonWidget) {
/* Get the Arrow inside the Button */
buttonChild = gtk_bin_get_child(GTK_BIN(gComboBoxEntryButtonWidget));
if (GTK_IS_HBOX(buttonChild)) {
/* appears-as-list = FALSE, cell-view = TRUE; the button
* contains an hbox. This hbox is there because ComboBoxEntry
* inherits from ComboBox which needs to place a cell renderer,
* a separator, and an arrow in the button when appears-as-list
* is FALSE. Here the hbox should only contain an arrow, since
* a ComboBoxEntry doesn't need all those widgets in the
* button. */
if (GTK_IS_BOX(buttonChild)) {
/* appears-as-list = FALSE, cell-view = TRUE; the button
* contains an hbox. This hbox is there because the ComboBox
* needs to place a cell renderer, a separator, and an arrow in
* the button when appears-as-list is FALSE. */
gtk_container_forall(GTK_CONTAINER(buttonChild),
moz_gtk_get_combo_box_entry_arrow,
NULL);