Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/vdemo/vdemo.c

    r2c7fdaa r10cb47e  
    8585        lbl->confirm = on_confirm;
    8686        lbl->cancel = on_cancel;
    87         bool initialized = init_label(
    88             &lbl->label, parent, caption, points, background, foreground);
     87        bool initialized = init_label(&lbl->label, parent, NULL, caption,
     88            points, background, foreground);
    8989        lbl->label.widget.destroy = my_label_destroy;
    9090        return initialized;
     
    110110{
    111111        if (argc >= 2) {
    112                 window_t *main_window = window_open(argv[1],
     112                window_t *main_window = window_open(argv[1], NULL,
    113113                    WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vdemo");
    114114                if (!main_window) {
     
    128128                my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16,
    129129                    lbl_bg, lbl_text);
    130                 button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg,
    131                     btn_fg, btn_text);
    132                 button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg,
    133                     btn_fg, btn_text);
    134                 grid_t *grid = create_grid(window_root(main_window), 2, 2, grd_bg);
     130                button_t *btn_confirm = create_button(NULL, NULL, "Confirm", 16,
     131                    btn_bg, btn_fg, btn_text);
     132                button_t *btn_cancel = create_button(NULL, NULL, "Cancel", 16,
     133                    btn_bg, btn_fg, btn_text);
     134                grid_t *grid = create_grid(window_root(main_window), NULL, 2, 2,
     135                    grd_bg);
    135136                if (!lbl_action || !btn_confirm || !btn_cancel || !grid) {
    136137                        window_close(main_window);
Note: See TracChangeset for help on using the changeset viewer.