diff options
author | rbuj <[email protected]> | 2020-05-10 11:54:23 +0200 |
---|---|---|
committer | Robert Antoni Buj Gelonch <[email protected]> | 2020-06-16 19:52:35 +0200 |
commit | 3774d5da2d07fc759305b53192a3e8898c5971c7 (patch) | |
tree | 3818ac6dc35d0d5fd1238e338536d80f6ed1415d | |
parent | f96255beb1b23e47048d1e0479fc53ef4c36b747 (diff) | |
download | marco-3774d5da2d07fc759305b53192a3e8898c5971c7.tar.bz2 marco-3774d5da2d07fc759305b53192a3e8898c5971c7.tar.xz |
Remove enum conversion warnings
-rw-r--r-- | src/tools/marco-window-demo.c | 2 | ||||
-rw-r--r-- | src/ui/draw-workspace.c | 2 | ||||
-rw-r--r-- | src/ui/theme-parser.c | 6 | ||||
-rw-r--r-- | src/ui/theme-viewer.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/marco-window-demo.c b/src/tools/marco-window-demo.c index c7268c36..efc72eeb 100644 --- a/src/tools/marco-window-demo.c +++ b/src/tools/marco-window-demo.c @@ -1051,7 +1051,7 @@ do_appwindow (GSimpleAction *action, contents = gtk_text_view_new (); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (contents), - PANGO_WRAP_WORD); + GTK_WRAP_WORD); gtk_container_add (GTK_CONTAINER (sw), contents); diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c index aca58440..8229abd0 100644 --- a/src/ui/draw-workspace.c +++ b/src/ui/draw-workspace.c @@ -89,7 +89,7 @@ draw_window (GtkWidget *widget, cairo_t *cr, const WnckWindowDisplayInfo *win, const GdkRectangle *winrect, - GtkStateType state) + GtkStateFlags state) { cairo_surface_t *icon; int icon_x, icon_y, icon_w, icon_h, scale; diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c index a328fd06..66130459 100644 --- a/src/ui/theme-parser.c +++ b/src/ui/theme-parser.c @@ -2340,7 +2340,7 @@ parse_draw_op_element (GMarkupParseContext *context, const char *height; const char *filled; gboolean filled_val; - GtkStateType state_val; + GtkStateFlags state_val; GtkShadowType shadow_val; GtkArrowType arrow_val; @@ -2430,7 +2430,7 @@ parse_draw_op_element (GMarkupParseContext *context, const char *y; const char *width; const char *height; - GtkStateType state_val; + GtkStateFlags state_val; GtkShadowType shadow_val; if (!locate_attributes (context, element_name, attribute_names, attribute_values, @@ -2498,7 +2498,7 @@ parse_draw_op_element (GMarkupParseContext *context, const char *x; const char *y1; const char *y2; - GtkStateType state_val; + GtkStateFlags state_val; if (!locate_attributes (context, element_name, attribute_names, attribute_values, error, diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c index 466f3bca..dc348fa1 100644 --- a/src/ui/theme-viewer.c +++ b/src/ui/theme-viewer.c @@ -207,7 +207,7 @@ normal_contents (void) contents = gtk_text_view_new (); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (contents), - PANGO_WRAP_WORD); + GTK_WRAP_WORD); gtk_container_add (GTK_CONTAINER (sw), contents); |