mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-12 05:20:17 +00:00
Handle priv->model being NULL. (#143856, Mariano Suárez-Alvarez)
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle priv->model being NULL. (#143856, Mariano Suárez-Alvarez)
This commit is contained in:
parent
5af5cc5a1a
commit
8eade402cc
34
ChangeLog
34
ChangeLog
@ -1,3 +1,8 @@
|
|||||||
|
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
|
||||||
|
priv->model being NULL. (#143856, Mariano Suárez-Alvarez)
|
||||||
|
|
||||||
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
||||||
@ -7,21 +12,22 @@
|
|||||||
|
|
||||||
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
Make the entry context menu work in editable text cells. The changes are
|
Make the entry context menu work in editable text cells. The changes
|
||||||
based on a patch by Kristian Rietveld, which implemented an approach outlined
|
are based on a patch by Kristian Rietveld, which implemented an
|
||||||
by Owen Taylor. (#50075)
|
approach outlined by Owen Taylor. (#50075)
|
||||||
|
|
||||||
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore
|
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
|
||||||
focus out if the entry menu is posted.
|
Ignore focus out if the entry menu is posted.
|
||||||
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and
|
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as
|
||||||
set up a signal handler to clear the flag if the menu is unmapped.
|
posted, and set up a signal handler to clear the flag if the menu
|
||||||
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up
|
is unmapped.
|
||||||
a timeout to stop editing if the focus is lost.
|
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag,
|
||||||
(popdown_timeout): Stop editing if the entry doesn't have focus any more.
|
set up a timeout to stop editing if the focus is lost.
|
||||||
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal
|
(popdown_timeout): Stop editing if the entry doesn't have focus anymore.
|
||||||
on the entry and keep a pointer to the entry.
|
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup
|
||||||
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear
|
signal on the entry and keep a pointer to the entry.
|
||||||
the pointer to the entry.
|
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup,
|
||||||
|
clear the pointer to the entry.
|
||||||
|
|
||||||
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
|
||||||
|
priv->model being NULL. (#143856, Mariano Suárez-Alvarez)
|
||||||
|
|
||||||
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
||||||
@ -7,21 +12,22 @@
|
|||||||
|
|
||||||
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
Make the entry context menu work in editable text cells. The changes are
|
Make the entry context menu work in editable text cells. The changes
|
||||||
based on a patch by Kristian Rietveld, which implemented an approach outlined
|
are based on a patch by Kristian Rietveld, which implemented an
|
||||||
by Owen Taylor. (#50075)
|
approach outlined by Owen Taylor. (#50075)
|
||||||
|
|
||||||
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore
|
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
|
||||||
focus out if the entry menu is posted.
|
Ignore focus out if the entry menu is posted.
|
||||||
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and
|
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as
|
||||||
set up a signal handler to clear the flag if the menu is unmapped.
|
posted, and set up a signal handler to clear the flag if the menu
|
||||||
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up
|
is unmapped.
|
||||||
a timeout to stop editing if the focus is lost.
|
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag,
|
||||||
(popdown_timeout): Stop editing if the entry doesn't have focus any more.
|
set up a timeout to stop editing if the focus is lost.
|
||||||
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal
|
(popdown_timeout): Stop editing if the entry doesn't have focus anymore.
|
||||||
on the entry and keep a pointer to the entry.
|
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup
|
||||||
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear
|
signal on the entry and keep a pointer to the entry.
|
||||||
the pointer to the entry.
|
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup,
|
||||||
|
clear the pointer to the entry.
|
||||||
|
|
||||||
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
|
||||||
|
priv->model being NULL. (#143856, Mariano Suárez-Alvarez)
|
||||||
|
|
||||||
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
||||||
@ -7,21 +12,22 @@
|
|||||||
|
|
||||||
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
Make the entry context menu work in editable text cells. The changes are
|
Make the entry context menu work in editable text cells. The changes
|
||||||
based on a patch by Kristian Rietveld, which implemented an approach outlined
|
are based on a patch by Kristian Rietveld, which implemented an
|
||||||
by Owen Taylor. (#50075)
|
approach outlined by Owen Taylor. (#50075)
|
||||||
|
|
||||||
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore
|
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
|
||||||
focus out if the entry menu is posted.
|
Ignore focus out if the entry menu is posted.
|
||||||
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and
|
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as
|
||||||
set up a signal handler to clear the flag if the menu is unmapped.
|
posted, and set up a signal handler to clear the flag if the menu
|
||||||
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up
|
is unmapped.
|
||||||
a timeout to stop editing if the focus is lost.
|
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag,
|
||||||
(popdown_timeout): Stop editing if the entry doesn't have focus any more.
|
set up a timeout to stop editing if the focus is lost.
|
||||||
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal
|
(popdown_timeout): Stop editing if the entry doesn't have focus anymore.
|
||||||
on the entry and keep a pointer to the entry.
|
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup
|
||||||
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear
|
signal on the entry and keep a pointer to the entry.
|
||||||
the pointer to the entry.
|
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup,
|
||||||
|
clear the pointer to the entry.
|
||||||
|
|
||||||
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
|
||||||
|
priv->model being NULL. (#143856, Mariano Suárez-Alvarez)
|
||||||
|
|
||||||
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
2004-06-07 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
|
||||||
@ -7,21 +12,22 @@
|
|||||||
|
|
||||||
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
Make the entry context menu work in editable text cells. The changes are
|
Make the entry context menu work in editable text cells. The changes
|
||||||
based on a patch by Kristian Rietveld, which implemented an approach outlined
|
are based on a patch by Kristian Rietveld, which implemented an
|
||||||
by Owen Taylor. (#50075)
|
approach outlined by Owen Taylor. (#50075)
|
||||||
|
|
||||||
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore
|
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
|
||||||
focus out if the entry menu is posted.
|
Ignore focus out if the entry menu is posted.
|
||||||
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and
|
(gtk_cell_renderer_text_populate_popup): Mark the entry menu as
|
||||||
set up a signal handler to clear the flag if the menu is unmapped.
|
posted, and set up a signal handler to clear the flag if the menu
|
||||||
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up
|
is unmapped.
|
||||||
a timeout to stop editing if the focus is lost.
|
(gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag,
|
||||||
(popdown_timeout): Stop editing if the entry doesn't have focus any more.
|
set up a timeout to stop editing if the focus is lost.
|
||||||
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal
|
(popdown_timeout): Stop editing if the entry doesn't have focus anymore.
|
||||||
on the entry and keep a pointer to the entry.
|
(gtk_cell_renderer_text_start_editing): Connect to the populate_popup
|
||||||
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear
|
signal on the entry and keep a pointer to the entry.
|
||||||
the pointer to the entry.
|
(gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup,
|
||||||
|
clear the pointer to the entry.
|
||||||
|
|
||||||
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
Sun Jun 6 23:24:43 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
@ -1412,7 +1412,8 @@ gtk_combo_box_remeasure (GtkComboBox *combo_box)
|
|||||||
GtkTreePath *path;
|
GtkTreePath *path;
|
||||||
gint padding = 0;
|
gint padding = 0;
|
||||||
|
|
||||||
if (!gtk_tree_model_get_iter_first (combo_box->priv->model, &iter))
|
if (!combo_box->priv->model ||
|
||||||
|
!gtk_tree_model_get_iter_first (combo_box->priv->model, &iter))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
combo_box->priv->width = 0;
|
combo_box->priv->width = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user