diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-06-18 00:11:26 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-06-18 00:11:26 -0400 |
| commit | edd57602b881f45253e00706d2aed51470fce413 (patch) | |
| tree | 556884df83697581f448fa115fba8590f8b312c9 /tests/testellipsise.c | |
| parent | cf75457faa739f295b907903ae56519edde24b2d (diff) | |
| download | gtk+-edd57602b881f45253e00706d2aed51470fce413.tar.gz | |
Mass api change from GtkExtendedLayout --> GtkSizeRequest
This commit makes a few massive changes to the extended layout
code:
a.) gtkextendedlayout.c --> gtksizerequest.c
b.) _is_height_for_width --> get_request_mode()
c.) get_desired_size(), get_desired_width(), get_desired_height() -->
get_size(), get_width(), get_height()
This is the first partial commit and only effects portions
of the tree that have already been merged in master (in order to
easily cherry pick this commit).
Conflicts:
gtk/Makefile.am
gtk/gtk.h
gtk/gtk.symbols
gtk/gtkextendedlayout.h
Diffstat (limited to 'tests/testellipsise.c')
| -rw-r--r-- | tests/testellipsise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/testellipsise.c b/tests/testellipsise.c index a466c5bf4f..805998c1c0 100644 --- a/tests/testellipsise.c +++ b/tests/testellipsise.c @@ -86,8 +86,8 @@ ebox_expose_event_cb (GtkWidget *widget, gtk_widget_translate_coordinates (label, widget, 0, 0, &x, &y); layout = gtk_widget_create_pango_layout (widget, ""); - gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (label), FALSE, - &minimum_size, &natural_size); + gtk_size_request_get_size (GTK_SIZE_REQUEST (label), + &minimum_size, &natural_size); pango_layout_set_markup (layout, "<span color='#c33'>\342\227\217 requisition</span>\n" |