update toolkit, fixes macos build

diff --git a/resource/.DS_Store b/resource/.DS_Store
index 2bdfb3010ce8dc6c77e262a4d30de4fdec5c2fb7..55753e79fee03f86088f08a787a442b260928ebe 100644 (file)
Binary files a/resource/.DS_Store and b/resource/.DS_Store differ

diff --git a/ui/cocoa/GridLayout.h b/ui/cocoa/GridLayout.h
index c7f751938eb22ab30d56a98c209b87452d48dc73..ccb652819e6dfb7b1f262bcd816fdc170830462c 100644 (file)
--- a/ui/cocoa/GridLayout.h
+++ b/ui/cocoa/GridLayout.h
@@ -56,7 +56,7 @@ typedef struct GridDef {
 
 @interface GridLayout : NSView<Container>
 
 
 @interface GridLayout : NSView<Container>
 

-@property UiContainerX *container;
+@property UiContainer *container;

 
 @property int columnspacing;
 @property int rowspacing;
 
 @property int columnspacing;
 @property int rowspacing;

diff --git a/ui/cocoa/MainWindow.m b/ui/cocoa/MainWindow.m
index 3806f6c561bc46d93126766cd06acde1b2da1363..d46025f710527f91082b5b0b0f2f7a84a9fa00bd 100644 (file)
--- a/ui/cocoa/MainWindow.m
+++ b/ui/cocoa/MainWindow.m
@@ -126,7 +126,7 @@
             [vbox.trailingAnchor constraintEqualToAnchor:content.trailingAnchor],
             [vbox.bottomAnchor constraintEqualToAnchor:content.bottomAnchor],
         ]];
             [vbox.trailingAnchor constraintEqualToAnchor:content.trailingAnchor],
             [vbox.bottomAnchor constraintEqualToAnchor:content.bottomAnchor],
         ]];

-        UiContainerX *container = ui_create_container(obj, vbox);
+        UiContainer *container = ui_create_container(obj, vbox);

         vbox.container = container;
         uic_object_push_container(obj, container);
     }
         vbox.container = container;
         uic_object_push_container(obj, container);
     }

diff --git a/ui/cocoa/TabView.m b/ui/cocoa/TabView.m
index 5b50048168e36009e101162498499983d3c63b1f..5cfc1bf945f82dc0ec69a4d7933141b802100f6f 100644 (file)
--- a/ui/cocoa/TabView.m
+++ b/ui/cocoa/TabView.m
@@ -113,7 +113,7 @@
     UiObject *newobj = uic_object_new_toplevel();
     newobj->widget = (__bridge void*)sub;
     
     UiObject *newobj = uic_object_new_toplevel();
     newobj->widget = (__bridge void*)sub;
     

-    UiContainerX *container = ui_create_container(newobj, sub);
+    UiContainer *container = ui_create_container(newobj, sub);

     uic_object_push_container(newobj, container);
     
     return newobj;
     uic_object_push_container(newobj, container);
     
     return newobj;

diff --git a/ui/cocoa/container.h b/ui/cocoa/container.h
index ed2dc67b92f2126271d09b9141c9267a43a09efd..89512acbfb921abd9d5cbe881248fd2b1705b45b 100644 (file)
--- a/ui/cocoa/container.h
+++ b/ui/cocoa/container.h
@@ -51,7 +51,7 @@ typedef struct UiLayout UiLayout;
 
 @protocol Container
 
 
 @protocol Container
 

-@property UiContainerX *container;
+@property UiContainer *container;

 
 - (void) addView:(NSView*)view layout:(UiLayout*)layout;
 
 
 - (void) addView:(NSView*)view layout:(UiLayout*)layout;
 


@@ -73,6 +73,6 @@ typedef struct UiLayout UiLayout;
 @end
 
 
 @end
 
 

-UiContainerX* ui_create_container(UiObject *obj, id<Container> container);
+UiContainer* ui_create_container(UiObject *obj, id<Container> container);

 
 void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout);
 
 void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout);

diff --git a/ui/cocoa/container.m b/ui/cocoa/container.m
index 9081da8a250254adf8b03f5b79e17ef6f4ad9996..b1a5a1ccda19a01e4ad12e9b3273afce5c9f655d 100644 (file)
--- a/ui/cocoa/container.m
+++ b/ui/cocoa/container.m
@@ -36,7 +36,7 @@
 static UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, NSUserInterfaceLayoutOrientation orientation) {
     BoxContainer *box = [[BoxContainer alloc] init:orientation spacing:args->spacing];
     box.translatesAutoresizingMaskIntoConstraints = false;
 static UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, NSUserInterfaceLayoutOrientation orientation) {
     BoxContainer *box = [[BoxContainer alloc] init:orientation spacing:args->spacing];
     box.translatesAutoresizingMaskIntoConstraints = false;

-    UiContainerX *container = ui_create_container(obj, box);
+    UiContainer *container = ui_create_container(obj, box);

     
     // add box to the parent
     UiLayout layout = UI_INIT_LAYOUT(args);
     
     // add box to the parent
     UiLayout layout = UI_INIT_LAYOUT(args);


@@ -61,7 +61,7 @@ UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs *args) {
     grid.translatesAutoresizingMaskIntoConstraints = false;
     grid.columnspacing = args->columnspacing;
     grid.rowspacing = args->rowspacing;
     grid.translatesAutoresizingMaskIntoConstraints = false;
     grid.columnspacing = args->columnspacing;
     grid.rowspacing = args->rowspacing;

-    UiContainerX *container = ui_create_container(obj, grid);
+    UiContainer *container = ui_create_container(obj, grid);

     grid.container = container;
     
     // add box to the parent
     grid.container = container;
     
     // add box to the parent


@@ -81,7 +81,7 @@ UIWIDGET ui_frame_create(UiObject *obj, UiFrameArgs *args) {
     ui_container_add(obj, frame, &layout);
     
     // add container to the chain
     ui_container_add(obj, frame, &layout);
     
     // add container to the chain

-    UiContainerX *container;
+    UiContainer *container;

     UiLayout subLayout = {0};
     switch(args->subcontainer) {
         default: {
     UiLayout subLayout = {0};
     switch(args->subcontainer) {
         default: {


@@ -137,7 +137,7 @@ UIWIDGET ui_scrolledwindow_create(UiObject *obj, UiFrameArgs *args) {
     UiLayout layout = UI_ARGS2LAYOUT(args);
     ui_container_add(obj, scrollview, &layout);
     
     UiLayout layout = UI_ARGS2LAYOUT(args);
     ui_container_add(obj, scrollview, &layout);
     

-    UiContainerX *container = ui_create_container(obj, scrollview);
+    UiContainer *container = ui_create_container(obj, scrollview);

     uic_object_push_container(obj, container);
     
     return (__bridge void*)scrollview;
     uic_object_push_container(obj, container);
     
     return (__bridge void*)scrollview;


@@ -152,19 +152,19 @@ UIWIDGET ui_tabview_create(UiObject *obj, UiTabViewArgs *args) {
     UiLayout layout = UI_ARGS2LAYOUT(args);
     ui_container_add(obj, tabview, &layout);
     
     UiLayout layout = UI_ARGS2LAYOUT(args);
     ui_container_add(obj, tabview, &layout);
     

-    UiContainerX *container = ui_create_container(obj, tabview);
+    UiContainer *container = ui_create_container(obj, tabview);

     uic_object_push_container(obj, container);
     
     return (__bridge void*)tabview;
 }
 
 void ui_tab_create(UiObject *obj, const char* title) {
     uic_object_push_container(obj, container);
     
     return (__bridge void*)tabview;
 }
 
 void ui_tab_create(UiObject *obj, const char* title) {

-    UiContainerX *ctn = obj->container_end;
+    UiContainer *ctn = obj->container_end;

     id<TabView> tabview = (__bridge id<TabView>)ctn->container;
     NSString *s = title ? [[NSString alloc]initWithUTF8String:title] : @"";
     NSView<Container> *sub = [tabview createTab:-1 title:s];
     
     id<TabView> tabview = (__bridge id<TabView>)ctn->container;
     NSString *s = title ? [[NSString alloc]initWithUTF8String:title] : @"";
     NSView<Container> *sub = [tabview createTab:-1 title:s];
     

-    UiContainerX *container = ui_create_container(obj, sub);
+    UiContainer *container = ui_create_container(obj, sub);

     uic_object_push_container(obj, container);
 }
 
     uic_object_push_container(obj, container);
 }
 


@@ -204,12 +204,12 @@ UIWIDGET ui_vsplitpane_create(UiObject *obj, UiSplitPaneArgs *args) {
 
 
 void ui_container_begin_close(UiObject *obj) {
 
 
 void ui_container_begin_close(UiObject *obj) {

-    UiContainerX *ct = obj->container_end;
+    UiContainer *ct = obj->container_end;

     ct->close = 1;
 }
 
 int ui_container_finish(UiObject *obj) {
     ct->close = 1;
 }
 
 int ui_container_finish(UiObject *obj) {

-    UiContainerX *ct = obj->container_end;
+    UiContainer *ct = obj->container_end;

     if(ct->close) {
         ui_end_new(obj);
         return 0;
     if(ct->close) {
         ui_end_new(obj);
         return 0;


@@ -307,8 +307,8 @@ int ui_container_finish(UiObject *obj) {
 
 /* ------------------------- private functions ------------------------- */
 
 
 /* ------------------------- private functions ------------------------- */
 

-UiContainerX* ui_create_container(UiObject *obj, id<Container> container) {
-    UiContainerX *ctn = ui_malloc(obj->ctx, sizeof(UiContainerX));
+UiContainer* ui_create_container(UiObject *obj, id<Container> container) {
+    UiContainer *ctn = ui_malloc(obj->ctx, sizeof(UiContainer));

     ctn->container = (__bridge void*)container;
     ctn->close = 0;
     ctn->prev = NULL;
     ctn->container = (__bridge void*)container;
     ctn->close = 0;
     ctn->prev = NULL;


@@ -318,7 +318,7 @@ UiContainerX* ui_create_container(UiObject *obj, id<Container> container) {
 }
 
 void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout) {
 }
 
 void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout) {

-    UiContainerX *ctn = obj->container_end;
+    UiContainer *ctn = obj->container_end;

     id<Container> container = (__bridge id<Container>)ctn->container;
     UiLayout adjustedLayout = *layout;
     if(adjustedLayout.margin > 0) {
     id<Container> container = (__bridge id<Container>)ctn->container;
     UiLayout adjustedLayout = *layout;
     if(adjustedLayout.margin > 0) {

diff --git a/ui/cocoa/window.m b/ui/cocoa/window.m
index 094638713441969a0e47f73ffab93993849e4491..b0259d280382af4c4c0ddf9d86cce5d0fb0cdf85 100644 (file)
--- a/ui/cocoa/window.m
+++ b/ui/cocoa/window.m
@@ -452,7 +452,7 @@ UiObject *ui_dialog_window_create(UiObject *parent, UiDialogWindowArgs *args) {
         [vbox.bottomAnchor constraintEqualToAnchor:buttonArea.topAnchor constant:0]
     ]];
      
         [vbox.bottomAnchor constraintEqualToAnchor:buttonArea.topAnchor constant:0]
     ]];
      

-    UiContainerX *container = ui_create_container(obj, vbox);
+    UiContainer *container = ui_create_container(obj, vbox);

     vbox.container = container;
     uic_object_push_container(obj, container);
     
     vbox.container = container;
     uic_object_push_container(obj, container);