Changeset f126c87 in mainline for uspace/app/fontviewer/fontviewer.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline.

File:

• uspace/app/fontviewer/fontviewer.c (modified) (2 diffs)

uspace/app/fontviewer/fontviewer.c

@@ -260 +260 @@
         }
         
-        main_window = window_open(argv[1], WINDOW_MAIN, "fontviewer");
+        main_window = window_open(argv[1], NULL, WINDOW_MAIN, "fontviewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -282 +282 @@
         }
         
-        canvas = create_canvas(window_root(main_window),
+        canvas = create_canvas(window_root(main_window), NULL,
             WINDOW_WIDTH, WINDOW_HEIGHT, surface);
         if (canvas == NULL) {