diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2011-02-03 19:01:55 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2011-02-03 19:01:55 +0900 |
| commit | ce000db7f65a2066ea2c7e1806ec5830a37ee27f (patch) | |
| tree | 83ceb9fcf435326c3d2f3b54d1ef006148fd7668 /gtk/gtkcellrenderer.c | |
| parent | 7894ff4bcbdb4c19c4f52d1d5e043377355e0e52 (diff) | |
| download | gtk+-ce000db7f65a2066ea2c7e1806ec5830a37ee27f.tar.gz | |
Added default implementation of GtkCellRendererClass.get_request_mode()
Having default implementations on abstract classes that do nothing
or print errors make life easier for language bindings implementors,
inside GTK+ this makes little or no difference.
Diffstat (limited to 'gtk/gtkcellrenderer.c')
| -rw-r--r-- | gtk/gtkcellrenderer.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 3e0de75629..615e243646 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -80,6 +80,7 @@ static void set_cell_bg_color (GtkCellRenderer *cell, GdkRGBA *rgba); /* Fallback GtkCellRenderer implementation to use remaining ->get_size() implementations */ +static GtkSizeRequestMode gtk_cell_renderer_real_get_request_mode(GtkCellRenderer *cell); static void gtk_cell_renderer_real_get_preferred_width (GtkCellRenderer *cell, GtkWidget *widget, gint *minimum_size, @@ -193,6 +194,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) class->render = NULL; class->get_size = NULL; + class->get_request_mode = gtk_cell_renderer_real_get_request_mode; class->get_preferred_width = gtk_cell_renderer_real_get_preferred_width; class->get_preferred_height = gtk_cell_renderer_real_get_preferred_height; class->get_preferred_width_for_height = gtk_cell_renderer_real_get_preferred_width_for_height; @@ -1212,6 +1214,13 @@ gtk_cell_renderer_real_get_preferred_size (GtkCellRenderer *cell, } } +static GtkSizeRequestMode +gtk_cell_renderer_real_get_request_mode (GtkCellRenderer *cell) +{ + /* By default cell renderers are height-for-width. */ + return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; +} + static void gtk_cell_renderer_real_get_preferred_width (GtkCellRenderer *cell, GtkWidget *widget, @@ -1368,16 +1377,9 @@ _gtk_cell_renderer_calc_offset (GtkCellRenderer *cell, GtkSizeRequestMode gtk_cell_renderer_get_request_mode (GtkCellRenderer *cell) { - GtkCellRendererClass *klass; - g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE); - klass = GTK_CELL_RENDERER_GET_CLASS (cell); - if (klass->get_request_mode) - return klass->get_request_mode (cell); - - /* By default cell renderers are height-for-width. */ - return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; + return GTK_CELL_RENDERER_GET_CLASS (cell)->get_request_mode (cell); } /** |