UI\App removal:

    This has been removed because it needs to be obvious that UI\quit and UI\run
    are actually global functions.

    In addition, the onShouldQuit handler belongs on the quit menu item.

    This changes the constructor of UI\Window

Author: krakjoe

classes/app.c

@@ -24,7 +24,6 @@
 #include <classes/control.h>
 #include <classes/point.h>
 #include <classes/size.h>
-#include <classes/app.h>
 #include <classes/window.h>
 
 zend_object_handlers php_ui_window_handlers;
@@ -98,36 +97,31 @@ int php_ui_window_closing_handler(uiWindow *w, void *arg) {
 	return result;
 }
 
-ZEND_BEGIN_ARG_INFO_EX(php_ui_window_construct_info, 0, 0, 4)
-	ZEND_ARG_OBJ_INFO(0, app, UI\\App, 0)
+ZEND_BEGIN_ARG_INFO_EX(php_ui_window_construct_info, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, title, IS_STRING, 0)
 	ZEND_ARG_OBJ_INFO(0, size, UI\\Size, 0)
 	ZEND_ARG_TYPE_INFO(0, menu, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-/* {{{ proto Window Window::__construct(App app, string title, Size size, bool menu) */
+/* {{{ proto Window Window::__construct(string title, Size size, bool menu) */
 PHP_METHOD(Window, __construct) 
 {
 	php_ui_window_t *win = php_ui_window_fetch(getThis());
-	zval *app = NULL;
 	zend_string *title = NULL;
 	zval *size = NULL;
 	php_ui_size_t *s;
 	zend_bool menu = 0;
 
-	if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "OSO|b", &app, uiApp_ce, &title, &size, uiSize_ce, &menu) != SUCCESS) {
+	if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "SO|b", &title, &size, uiSize_ce, &menu) != SUCCESS) {
 		return;
 	}
 
 	s = php_ui_size_fetch(size);
 
-	win->w = uiNewWindow(ZSTR_VAL(title), (int) s->width, (int) s->height, menu);
+	win->w = uiNewWindow(ZSTR_VAL(title), 
+		(int) s->width, (int) s->height, menu);
 
 	uiWindowOnClosing(win->w, php_ui_window_closing_handler, win);
-
-	php_ui_app_window(app, getThis());
-
-	zend_update_property(win->std.ce, getThis(), ZEND_STRL("app"), app);
 } /* }}} */
 
 ZEND_BEGIN_ARG_INFO_EX(php_ui_window_set_title_info, 0, 0, 1)
@@ -448,7 +442,6 @@ PHP_MINIT_FUNCTION(UI_Window)
 	uiWindow_ce = zend_register_internal_class_ex(&ce, uiControl_ce);
 	uiWindow_ce->create_object = php_ui_window_create;
 	zend_declare_property_null(uiWindow_ce, ZEND_STRL("controls"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(uiWindow_ce, ZEND_STRL("app"), ZEND_ACC_PROTECTED);
 
 	memcpy(&php_ui_window_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 

classes/app.h

@@ -54,5 +54,5 @@ if test "$PHP_UI" != "no"; then
   PHP_SUBST(UI_SHARED_LIBADD)
   PHP_SUBST(EXTRA_LDFLAGS)
 
-  PHP_NEW_EXTENSION(ui, ui.c classes/form.c classes/grid.c classes/app.c classes/window.c classes/control.c classes/tab.c classes/box.c classes/check.c classes/button.c classes/cbutton.c classes/label.c classes/entry.c classes/multi.c classes/group.c classes/spin.c classes/slider.c classes/progress.c classes/separator.c classes/combo.c classes/ecombo.c classes/radio.c classes/picker.c classes/menu.c classes/item.c classes/point.c classes/size.c classes/area.c classes/path.c classes/color.c classes/brush.c classes/pen.c classes/stroke.c classes/matrix.c classes/descriptor.c classes/font.c classes/layout.c classes/exceptions.c classes/executor.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+  PHP_NEW_EXTENSION(ui, ui.c classes/form.c classes/grid.c classes/window.c classes/control.c classes/tab.c classes/box.c classes/check.c classes/button.c classes/cbutton.c classes/label.c classes/entry.c classes/multi.c classes/group.c classes/spin.c classes/slider.c classes/progress.c classes/separator.c classes/combo.c classes/ecombo.c classes/radio.c classes/picker.c classes/menu.c classes/item.c classes/point.c classes/size.c classes/area.c classes/path.c classes/color.c classes/brush.c classes/pen.c classes/stroke.c classes/matrix.c classes/descriptor.c classes/font.c classes/layout.c classes/exceptions.c classes/executor.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 fi

classes/window.c

@@ -12,7 +12,7 @@ if (PHP_UI != "no") {
 		EXTENSION("ui", "ui.c", PHP_UI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 /I" + configure_module_dirname);
 		ADD_SOURCES(
 			configure_module_dirname + '/classes',
-			"window.c box.c form.c grid.c app.c button.c cbutton.c check.c  combo.c  control.c  ecombo.c  entry.c  group.c  item.c  label.c  menu.c  multi.c  picker.c  progress.c  radio.c  separator.c  slider.c  spin.c  tab.c point.c size.c area.c pen.c path.c color.c brush.c stroke.c matrix.c descriptor.c font.c layout.c exceptions.c executor.c",
+			"window.c box.c form.c grid.c button.c cbutton.c check.c  combo.c  control.c  ecombo.c  entry.c  group.c  item.c  label.c  menu.c  multi.c  picker.c  progress.c  radio.c  separator.c  slider.c  spin.c  tab.c point.c size.c area.c pen.c path.c color.c brush.c stroke.c matrix.c descriptor.c font.c layout.c exceptions.c executor.c",
 			"ui"
 		);
 	} else {

config.m4

@@ -1,6 +1,5 @@
 <?php
 use UI\Size;
-use UI\App;
 use UI\Menu;
 use UI\MenuItem;
 use UI\Window;
@@ -25,9 +24,7 @@
 use UI\Controls\Separator;
 use UI\Controls\ColorButton;
 
-$app = new App();
-
-$window = new Window($app, "libui Control Gallery", new Size(640, 480), true);
+$window = new Window("libui Control Gallery", new Size(640, 480), true);
 $window->setMargin(true);
 
 $tab = new Tab();
@@ -292,5 +289,5 @@ public function onClick() {
 
 $window->show();
 
-$app->run();
+UI\run();
 ?>

config.w32

@@ -1,5 +1,4 @@
 <?php
-use UI\App;
 use UI\Point;
 use UI\Size;
 use UI\Window;
@@ -22,9 +21,7 @@
 use UI\Draw\Text\Font;
 use UI\Draw\Text\Layout;
 
-$app = new App();
-
-$window = new Window($app, "libui Histogram Example", new Size(640, 480), true);
+$window = new Window("libui Histogram Example", new Size(640, 480), true);
 
 $window->setMargin(true);
 
@@ -290,5 +287,5 @@ public function getFont(int $selected = -1, int $size = 12) {
 
 $window->show();
 
-$app->run();
+UI\run();
 ?>