mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 10:50:10 +00:00
rename member fields from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems
2001-01-20 Havoc Pennington <hp@pobox.com> * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to me, matches Pango
This commit is contained in:
parent
e0fee22e78
commit
18742b1dc3
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-01-20 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
|
||||
from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
|
||||
me, matches Pango
|
||||
|
||||
2001-01-22 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
|
||||
|
@ -110,13 +110,13 @@ create_tags (GtkTextBuffer *buffer)
|
||||
g_object_set (G_OBJECT (tag), "editable", FALSE, NULL);
|
||||
|
||||
tag = gtk_text_buffer_create_tag (buffer, "word_wrap");
|
||||
g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_WORD, NULL);
|
||||
g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_WORD, NULL);
|
||||
|
||||
tag = gtk_text_buffer_create_tag (buffer, "char_wrap");
|
||||
g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_CHAR, NULL);
|
||||
g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_CHAR, NULL);
|
||||
|
||||
tag = gtk_text_buffer_create_tag (buffer, "no_wrap");
|
||||
g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_NONE, NULL);
|
||||
g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_NONE, NULL);
|
||||
|
||||
tag = gtk_text_buffer_create_tag (buffer, "center");
|
||||
g_object_set (G_OBJECT (tag), "justification", GTK_JUSTIFY_CENTER, NULL);
|
||||
|
@ -1121,19 +1121,19 @@ set_para_values (GtkTextLayout *layout,
|
||||
|
||||
switch (style->wrap_mode)
|
||||
{
|
||||
case GTK_WRAPMODE_CHAR:
|
||||
case GTK_WRAP_CHAR:
|
||||
layout_width = layout->screen_width - display->left_margin - display->right_margin;
|
||||
pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
|
||||
pango_layout_set_wrap (display->layout, PANGO_WRAP_CHAR);
|
||||
break;
|
||||
|
||||
case GTK_WRAPMODE_WORD:
|
||||
case GTK_WRAP_WORD:
|
||||
layout_width = layout->screen_width - display->left_margin - display->right_margin;
|
||||
pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
|
||||
pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD);
|
||||
break;
|
||||
|
||||
case GTK_WRAPMODE_NONE:
|
||||
case GTK_WRAP_NONE:
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -475,7 +475,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
|
||||
_("Wrap mode"),
|
||||
_("Whether to wrap lines never, at word boundaries, or at character boundaries"),
|
||||
GTK_TYPE_WRAP_MODE,
|
||||
GTK_WRAPMODE_NONE,
|
||||
GTK_WRAP_NONE,
|
||||
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
||||
|
||||
|
||||
|
@ -14,9 +14,9 @@ typedef struct _GtkTextTagTable GtkTextTagTable;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
GTK_WRAPMODE_NONE,
|
||||
GTK_WRAPMODE_CHAR,
|
||||
GTK_WRAPMODE_WORD
|
||||
GTK_WRAP_NONE,
|
||||
GTK_WRAP_CHAR,
|
||||
GTK_WRAP_WORD
|
||||
} GtkWrapMode;
|
||||
|
||||
typedef struct _GtkTextAttributes GtkTextAttributes;
|
||||
|
@ -752,7 +752,7 @@ gtk_text_view_init (GtkTextView *text_view)
|
||||
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
|
||||
|
||||
/* Set up default style */
|
||||
text_view->wrap_mode = GTK_WRAPMODE_NONE;
|
||||
text_view->wrap_mode = GTK_WRAP_NONE;
|
||||
text_view->pixels_above_lines = 0;
|
||||
text_view->pixels_below_lines = 0;
|
||||
text_view->pixels_inside_wrap = 0;
|
||||
@ -1588,8 +1588,8 @@ gtk_text_view_set_wrap_mode (GtkTextView *text_view,
|
||||
GtkWrapMode
|
||||
gtk_text_view_get_wrap_mode (GtkTextView *text_view)
|
||||
{
|
||||
g_return_val_if_fail (text_view != NULL, GTK_WRAPMODE_NONE);
|
||||
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAPMODE_NONE);
|
||||
g_return_val_if_fail (text_view != NULL, GTK_WRAP_NONE);
|
||||
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAP_NONE);
|
||||
|
||||
return text_view->wrap_mode;
|
||||
}
|
||||
|
@ -506,11 +506,11 @@ fill_example_buffer (GtkTextBuffer *buffer)
|
||||
tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
|
||||
|
||||
g_object_set (G_OBJECT (tag),
|
||||
"wrap_mode", GTK_WRAPMODE_WORD,
|
||||
"wrap_mode", GTK_WRAP_WORD,
|
||||
"direction", GTK_TEXT_DIR_RTL,
|
||||
"indent", 30,
|
||||
"left_margin", 20,
|
||||
"right_margin", 20,
|
||||
"right_margin", 20,
|
||||
NULL);
|
||||
|
||||
|
||||
@ -1176,13 +1176,13 @@ view_init_menus (View *view)
|
||||
|
||||
switch (wrap_mode)
|
||||
{
|
||||
case GTK_WRAPMODE_NONE:
|
||||
case GTK_WRAP_NONE:
|
||||
menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Off");
|
||||
break;
|
||||
case GTK_WRAPMODE_WORD:
|
||||
case GTK_WRAP_WORD:
|
||||
menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words");
|
||||
break;
|
||||
case GTK_WRAPMODE_CHAR:
|
||||
case GTK_WRAP_CHAR:
|
||||
menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Chars");
|
||||
break;
|
||||
default:
|
||||
@ -1209,9 +1209,9 @@ static GtkItemFactoryEntry menu_items[] =
|
||||
{ "/Edit/Find...", NULL, do_search, 0, NULL },
|
||||
|
||||
{ "/_Settings", NULL, 0, 0, "<Branch>" },
|
||||
{ "/Settings/Wrap _Off", NULL, do_wrap_changed, GTK_WRAPMODE_NONE, "<RadioItem>" },
|
||||
{ "/Settings/Wrap _Words", NULL, do_wrap_changed, GTK_WRAPMODE_WORD, "/Settings/Wrap Off" },
|
||||
{ "/Settings/Wrap _Chars", NULL, do_wrap_changed, GTK_WRAPMODE_CHAR, "/Settings/Wrap Off" },
|
||||
{ "/Settings/Wrap _Off", NULL, do_wrap_changed, GTK_WRAP_NONE, "<RadioItem>" },
|
||||
{ "/Settings/Wrap _Words", NULL, do_wrap_changed, GTK_WRAP_WORD, "/Settings/Wrap Off" },
|
||||
{ "/Settings/Wrap _Chars", NULL, do_wrap_changed, GTK_WRAP_CHAR, "/Settings/Wrap Off" },
|
||||
{ "/Settings/sep1", NULL, 0, 0, "<Separator>" },
|
||||
{ "/Settings/Editable", NULL, do_editable_changed, TRUE, "<RadioItem>" },
|
||||
{ "/Settings/Not editable", NULL, do_editable_changed, FALSE, "/Settings/Editable" },
|
||||
@ -2146,7 +2146,7 @@ create_view (Buffer *buffer)
|
||||
|
||||
view->text_view = gtk_text_view_new_with_buffer (buffer->buffer);
|
||||
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view->text_view),
|
||||
GTK_WRAPMODE_WORD);
|
||||
GTK_WRAP_WORD);
|
||||
|
||||
/* Draw tab stops in the top and bottom windows. */
|
||||
|
||||
|
@ -506,11 +506,11 @@ fill_example_buffer (GtkTextBuffer *buffer)
|
||||
tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
|
||||
|
||||
g_object_set (G_OBJECT (tag),
|
||||
"wrap_mode", GTK_WRAPMODE_WORD,
|
||||
"wrap_mode", GTK_WRAP_WORD,
|
||||
"direction", GTK_TEXT_DIR_RTL,
|
||||
"indent", 30,
|
||||
"left_margin", 20,
|
||||
"right_margin", 20,
|
||||
"right_margin", 20,
|
||||
NULL);
|
||||
|
||||
|
||||
@ -1176,13 +1176,13 @@ view_init_menus (View *view)
|
||||
|
||||
switch (wrap_mode)
|
||||
{
|
||||
case GTK_WRAPMODE_NONE:
|
||||
case GTK_WRAP_NONE:
|
||||
menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Off");
|
||||
break;
|
||||
case GTK_WRAPMODE_WORD:
|
||||
case GTK_WRAP_WORD:
|
||||
menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words");
|
||||
break;
|
||||
case GTK_WRAPMODE_CHAR:
|
||||
case GTK_WRAP_CHAR:
|
||||
menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Chars");
|
||||
break;
|
||||
default:
|
||||
@ -1209,9 +1209,9 @@ static GtkItemFactoryEntry menu_items[] =
|
||||
{ "/Edit/Find...", NULL, do_search, 0, NULL },
|
||||
|
||||
{ "/_Settings", NULL, 0, 0, "<Branch>" },
|
||||
{ "/Settings/Wrap _Off", NULL, do_wrap_changed, GTK_WRAPMODE_NONE, "<RadioItem>" },
|
||||
{ "/Settings/Wrap _Words", NULL, do_wrap_changed, GTK_WRAPMODE_WORD, "/Settings/Wrap Off" },
|
||||
{ "/Settings/Wrap _Chars", NULL, do_wrap_changed, GTK_WRAPMODE_CHAR, "/Settings/Wrap Off" },
|
||||
{ "/Settings/Wrap _Off", NULL, do_wrap_changed, GTK_WRAP_NONE, "<RadioItem>" },
|
||||
{ "/Settings/Wrap _Words", NULL, do_wrap_changed, GTK_WRAP_WORD, "/Settings/Wrap Off" },
|
||||
{ "/Settings/Wrap _Chars", NULL, do_wrap_changed, GTK_WRAP_CHAR, "/Settings/Wrap Off" },
|
||||
{ "/Settings/sep1", NULL, 0, 0, "<Separator>" },
|
||||
{ "/Settings/Editable", NULL, do_editable_changed, TRUE, "<RadioItem>" },
|
||||
{ "/Settings/Not editable", NULL, do_editable_changed, FALSE, "/Settings/Editable" },
|
||||
@ -2146,7 +2146,7 @@ create_view (Buffer *buffer)
|
||||
|
||||
view->text_view = gtk_text_view_new_with_buffer (buffer->buffer);
|
||||
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view->text_view),
|
||||
GTK_WRAPMODE_WORD);
|
||||
GTK_WRAP_WORD);
|
||||
|
||||
/* Draw tab stops in the top and bottom windows. */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user