comparison: ui/gtk/toolkit.c
ui/gtk/toolkit.c
- changeset 1129
- a4affe75198c
- parent 1128
- 0a150985d6b6
equal
deleted
inserted
replaced
| 1128:0a150985d6b6 | 1129:a4affe75198c |
|---|---|
| 163 } | 163 } |
| 164 #endif | 164 #endif |
| 165 | 165 |
| 166 void ui_show(UiObject *obj) { | 166 void ui_show(UiObject *obj) { |
| 167 gboolean visible = FALSE; | 167 gboolean visible = FALSE; |
| 168 uic_check_state_widgets(obj->ctx); | |
| 169 if(obj->widget) { | 168 if(obj->widget) { |
| 170 visible = gtk_widget_is_visible(obj->widget); | 169 visible = gtk_widget_is_visible(obj->widget); |
| 171 #if GTK_MAJOR_VERSION >= 4 | 170 #if GTK_MAJOR_VERSION >= 4 |
| 172 gtk_window_present(GTK_WINDOW(obj->widget)); | 171 gtk_window_present(GTK_WINDOW(obj->widget)); |
| 173 #elif GTK_MAJOR_VERSION <= 3 | 172 #elif GTK_MAJOR_VERSION <= 3 |
| 174 gtk_widget_show_all(obj->widget); | 173 gtk_widget_show_all(obj->widget); |
| 175 #endif | 174 #endif |
| 176 } | 175 } |
| 176 uic_check_state_widgets(obj->ctx); | |
| 177 | 177 |
| 178 if(!visible) { | 178 if(!visible) { |
| 179 obj->ref++; | 179 obj->ref++; |
| 180 } | 180 } |
| 181 } | 181 } |
| 182 | 182 |
| 183 void ui_close(UiObject *obj) { | 183 void ui_close(UiObject *obj) { |
| 184 uic_context_prepare_close(obj->ctx); // TODO: should this be moved to the close event handler? Yes! | |
| 185 /* | |
| 186 if(obj->widget) { | |
| 187 #if GTK_CHECK_VERSION(4, 0, 0) | |
| 188 gtk_window_close(GTK_WINDOW(obj->widget)); | |
| 189 #else | |
| 190 gtk_widget_destroy(obj->widget); | |
| 191 #endif | |
| 192 } else { | |
| 193 ui_window_close_request(obj); | |
| 194 } | |
| 195 */ | |
| 196 ui_window_close_request(obj); | 184 ui_window_close_request(obj); |
| 197 } | 185 } |
| 198 | 186 |
| 199 | 187 |
| 200 static gboolean ui_job_finished(void *data) { | 188 static gboolean ui_job_finished(void *data) { |
