comparison: ui/win32/window.c
ui/win32/window.c
- changeset 954
- 07c1effb2a31
- parent 953
- c98404829cd3
- child 986
- 6f7600c2b9e1
equal
deleted
inserted
replaced
| 953:c98404829cd3 | 954:07c1effb2a31 |
|---|---|
| 37 #include <stdbool.h> | 37 #include <stdbool.h> |
| 38 #include <stdio.h> | 38 #include <stdio.h> |
| 39 #include <stdlib.h> | 39 #include <stdlib.h> |
| 40 | 40 |
| 41 #include "win32.h" | 41 #include "win32.h" |
| 42 #include "menu.h" | |
| 42 | 43 |
| 43 static W32WidgetClass w32_toplevel_widget_class = { | 44 static W32WidgetClass w32_toplevel_widget_class = { |
| 44 .eventproc = ui_window_widget_event, | 45 .eventproc = ui_window_widget_event, |
| 45 .show = ui_window_widget_show, | 46 .show = ui_window_widget_show, |
| 46 .enable = NULL, | 47 .enable = NULL, |
| 85 NULL, | 86 NULL, |
| 86 NULL, | 87 NULL, |
| 87 hInstance, | 88 hInstance, |
| 88 NULL); | 89 NULL); |
| 89 | 90 |
| 91 if (!simple) { | |
| 92 HMENU menubar = ui_create_main_menu(obj); | |
| 93 if (menubar) { | |
| 94 SetMenu(hwnd, menubar); | |
| 95 } | |
| 96 } | |
| 97 | |
| 90 UpdateWindow(hwnd); | 98 UpdateWindow(hwnd); |
| 91 | 99 |
| 92 UiContainerX *container = ui_box_container_create(obj, hwnd, UI_BOX_VERTICAL, 0, INSETS_ZERO); | 100 UiContainerX *container = ui_box_container_create(obj, hwnd, UI_BOX_VERTICAL, 0, INSETS_ZERO); |
| 93 uic_object_push_container(obj, container); | 101 uic_object_push_container(obj, container); |
| 94 UiBoxContainer *box = (UiBoxContainer*)container; | 102 UiBoxContainer *box = (UiBoxContainer*)container; |
