diff options
author | David Walter Seikel | 2014-05-04 17:12:08 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-04 17:12:08 +1000 |
commit | f8fc00691417f628ba09e53552f7ac89cfd98faa (patch) | |
tree | d075a31f01c4b9563affef7556bf94fceea6c95a /src/extantz/extantz.c | |
parent | Add a file selector. (diff) | |
download | SledjHamr-f8fc00691417f628ba09e53552f7ac89cfd98faa.zip SledjHamr-f8fc00691417f628ba09e53552f7ac89cfd98faa.tar.gz SledjHamr-f8fc00691417f628ba09e53552f7ac89cfd98faa.tar.bz2 SledjHamr-f8fc00691417f628ba09e53552f7ac89cfd98faa.tar.xz |
New fangWin and Widget structures, and modify fangWin stuff to use them.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 1d37ade..a9e5f3e 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -327,6 +327,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
327 | Evas_Object *obj; | 327 | Evas_Object *obj; |
328 | EPhysics_World *world; | 328 | EPhysics_World *world; |
329 | GLData *gld = NULL; | 329 | GLData *gld = NULL; |
330 | fangWin *chat = NULL, *files = NULL, *woMan = NULL; | ||
330 | char buf[PATH_MAX]; | 331 | char buf[PATH_MAX]; |
331 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. | 332 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. |
332 | 333 | ||
@@ -410,9 +411,9 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
410 | elm_win_resize_object_add(ourGlobals.win, ourGlobals.bx); | 411 | elm_win_resize_object_add(ourGlobals.win, ourGlobals.bx); |
411 | 412 | ||
412 | // overlay_add(&ourGlobals); | 413 | // overlay_add(&ourGlobals); |
413 | woMan_add(&ourGlobals); | 414 | woMan = woMan_add(&ourGlobals); |
414 | chat_add(&ourGlobals); | 415 | chat = chat_add(&ourGlobals); |
415 | files_add(&ourGlobals); | 416 | // files = files_add(&ourGlobals); |
416 | 417 | ||
417 | // Gotta do this after adding the windows, otherwise the menu renders under the window. | 418 | // Gotta do this after adding the windows, otherwise the menu renders under the window. |
418 | // This sucks, gotta redefine this menu each time we create a new window? | 419 | // This sucks, gotta redefine this menu each time we create a new window? |
@@ -447,6 +448,9 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
447 | { | 448 | { |
448 | Evas_3D_Demo_fini(&ourGlobals); | 449 | Evas_3D_Demo_fini(&ourGlobals); |
449 | eo_unref(ourGlobals.tb); | 450 | eo_unref(ourGlobals.tb); |
451 | fang_win_del(&ourGlobals, woMan); | ||
452 | fang_win_del(&ourGlobals, chat); | ||
453 | fang_win_del(&ourGlobals, files); | ||
450 | eo_unref(ourGlobals.bx); | 454 | eo_unref(ourGlobals.bx); |
451 | evas_object_del(ourGlobals.win); | 455 | evas_object_del(ourGlobals.win); |
452 | } | 456 | } |