diff --git a/gb.qt4/src/CContainer.cpp b/gb.qt4/src/CContainer.cpp index 733e8a15d..c58324d31 100755 --- a/gb.qt4/src/CContainer.cpp +++ b/gb.qt4/src/CContainer.cpp @@ -727,7 +727,7 @@ static QRect getRect(void *_object) return w->contentsRect(); } -BEGIN_METHOD_VOID(CCONTAINER_children_next) +BEGIN_METHOD_VOID(Container_Children_next) #ifdef DEBUG if (!CONTAINER) @@ -761,7 +761,7 @@ BEGIN_METHOD_VOID(CCONTAINER_children_next) END_METHOD -BEGIN_METHOD(CCONTAINER_children_get, GB_INTEGER index) +BEGIN_METHOD(Container_Children_get, GB_INTEGER index) QObjectList list = CONTAINER->children(); int index = VARG(index); @@ -790,7 +790,7 @@ BEGIN_METHOD(CCONTAINER_children_get, GB_INTEGER index) END_METHOD -BEGIN_PROPERTY(CCONTAINER_children_count) +BEGIN_PROPERTY(Container_Children_Count) QWidget *wid = CONTAINER; QObjectList list; @@ -815,7 +815,7 @@ BEGIN_PROPERTY(CCONTAINER_children_count) END_PROPERTY -BEGIN_METHOD_VOID(CCONTAINER_children_clear) +BEGIN_METHOD_VOID(Container_Children_Clear) QWidget *wid = CONTAINER; QObjectList list; @@ -837,7 +837,7 @@ BEGIN_METHOD_VOID(CCONTAINER_children_clear) END_METHOD -BEGIN_PROPERTY(CCONTAINER_x) +BEGIN_PROPERTY(Container_X) #ifdef DEBUG if (!CONTAINER) @@ -852,7 +852,7 @@ BEGIN_PROPERTY(CCONTAINER_x) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_y) +BEGIN_PROPERTY(Container_Y) #ifdef DEBUG if (!CONTAINER) @@ -867,7 +867,7 @@ BEGIN_PROPERTY(CCONTAINER_y) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_width) +BEGIN_PROPERTY(Container_Width) #ifdef DEBUG if (!CONTAINER) @@ -879,7 +879,7 @@ BEGIN_PROPERTY(CCONTAINER_width) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_height) +BEGIN_PROPERTY(Container_Height) #ifdef DEBUG if (!CONTAINER) @@ -890,7 +890,7 @@ BEGIN_PROPERTY(CCONTAINER_height) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_border) +BEGIN_PROPERTY(Container_Border) MyContainer *w = qobject_cast(THIS->container); @@ -907,7 +907,7 @@ BEGIN_PROPERTY(CCONTAINER_border) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_arrangement) +BEGIN_PROPERTY(Container_Arrangement) if (READ_PROPERTY) GB.ReturnInteger(THIS_ARRANGEMENT->mode); @@ -922,10 +922,10 @@ BEGIN_PROPERTY(CCONTAINER_arrangement) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_arrangement) +BEGIN_PROPERTY(UserContainer_Arrangement) CCONTAINER *cont = (CCONTAINER *)CWidget::get(CONTAINER); - CCONTAINER_arrangement(cont, _param); + Container_Arrangement(cont, _param); if (!READ_PROPERTY) { THIS_USERCONTAINER->save = cont->arrangement; @@ -935,7 +935,7 @@ BEGIN_PROPERTY(CUSERCONTAINER_arrangement) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_auto_resize) +BEGIN_PROPERTY(Container_AutoResize) if (READ_PROPERTY) GB.ReturnBoolean(THIS_ARRANGEMENT->autoresize); @@ -951,10 +951,10 @@ BEGIN_PROPERTY(CCONTAINER_auto_resize) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_auto_resize) +BEGIN_PROPERTY(UserContainer_AutoResize) CCONTAINER *cont = (CCONTAINER *)CWidget::get(CONTAINER); - CCONTAINER_auto_resize(cont, _param); + Container_AutoResize(cont, _param); if (!READ_PROPERTY) { THIS_USERCONTAINER->save = cont->arrangement; @@ -964,7 +964,7 @@ BEGIN_PROPERTY(CUSERCONTAINER_auto_resize) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_margin) +BEGIN_PROPERTY(Container_Margin) if (READ_PROPERTY) GB.ReturnBoolean(THIS_ARRANGEMENT->margin); @@ -980,10 +980,10 @@ BEGIN_PROPERTY(CCONTAINER_margin) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_margin) +BEGIN_PROPERTY(UserContainer_Margin) CCONTAINER *cont = (CCONTAINER *)CWidget::get(CONTAINER); - CCONTAINER_margin(cont, _param); + Container_Margin(cont, _param); if (!READ_PROPERTY) { THIS_USERCONTAINER->save = cont->arrangement; @@ -993,7 +993,7 @@ BEGIN_PROPERTY(CUSERCONTAINER_margin) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_spacing) +BEGIN_PROPERTY(Container_Spacing) if (READ_PROPERTY) GB.ReturnBoolean(THIS_ARRANGEMENT->spacing); @@ -1009,10 +1009,10 @@ BEGIN_PROPERTY(CCONTAINER_spacing) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_spacing) +BEGIN_PROPERTY(UserContainer_Spacing) CCONTAINER *cont = (CCONTAINER *)CWidget::get(CONTAINER); - CCONTAINER_spacing(cont, _param); + Container_Spacing(cont, _param); if (!READ_PROPERTY) { THIS_USERCONTAINER->save = cont->arrangement; @@ -1048,7 +1048,7 @@ BEGIN_PROPERTY(UserContainer_Invert) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_padding) +BEGIN_PROPERTY(Container_Padding) if (READ_PROPERTY) GB.ReturnInteger(THIS_ARRANGEMENT->padding); @@ -1064,10 +1064,10 @@ BEGIN_PROPERTY(CCONTAINER_padding) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_padding) +BEGIN_PROPERTY(UserContainer_Padding) CCONTAINER *cont = (CCONTAINER *)CWidget::get(CONTAINER); - CCONTAINER_padding(cont, _param); + Container_Padding(cont, _param); if (!READ_PROPERTY) { THIS_USERCONTAINER->save = cont->arrangement; @@ -1076,7 +1076,7 @@ BEGIN_PROPERTY(CUSERCONTAINER_padding) END_PROPERTY -BEGIN_PROPERTY(CCONTAINER_indent) +BEGIN_PROPERTY(Container_Indent) if (READ_PROPERTY) GB.ReturnInteger(THIS_ARRANGEMENT->indent); @@ -1093,7 +1093,7 @@ BEGIN_PROPERTY(CCONTAINER_indent) END_PROPERTY -BEGIN_METHOD(CUSERCONTROL_new, GB_OBJECT parent) +BEGIN_METHOD(UserControl_new, GB_OBJECT parent) MyContainer *wid = new MyContainer(QCONTAINER(VARG(parent))); @@ -1106,7 +1106,7 @@ BEGIN_METHOD(CUSERCONTROL_new, GB_OBJECT parent) END_METHOD -BEGIN_PROPERTY(CUSERCONTROL_container) +BEGIN_PROPERTY(UserControl_Container) CCONTAINER *current = (CCONTAINER *)CWidget::get(CONTAINER); @@ -1123,6 +1123,7 @@ BEGIN_PROPERTY(CUSERCONTROL_container) if (!cont) { THIS->container = WIDGET; + CWIDGET_register_proxy(THIS, NULL); return; } @@ -1147,22 +1148,18 @@ BEGIN_PROPERTY(CUSERCONTROL_container) CWIDGET_update_design((CWIDGET *)THIS); CCONTAINER_arrange(THIS); + + CWIDGET_register_proxy(THIS, cont); } } END_PROPERTY -BEGIN_PROPERTY(UserContainer_Background) - - - -END_PROPERTY - -BEGIN_PROPERTY(CUSERCONTAINER_indent) +BEGIN_PROPERTY(UserContainer_Indent) CCONTAINER *cont = (CCONTAINER *)CWidget::get(CONTAINER); - CCONTAINER_indent(cont, _param); + Container_Indent(cont, _param); if (!READ_PROPERTY) { THIS_USERCONTAINER->save = cont->arrangement; @@ -1171,16 +1168,16 @@ BEGIN_PROPERTY(CUSERCONTAINER_indent) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_container) +BEGIN_PROPERTY(UserContainer_Container) //CCONTAINER *before; CCONTAINER *after; if (READ_PROPERTY) - CUSERCONTROL_container(_object, _param); + UserControl_Container(_object, _param); else { - CUSERCONTROL_container(_object, _param); + UserControl_Container(_object, _param); after = (CCONTAINER *)CWidget::get(THIS->container); after->arrangement = THIS_USERCONTAINER->save; @@ -1191,7 +1188,7 @@ BEGIN_PROPERTY(CUSERCONTAINER_container) END_PROPERTY -BEGIN_PROPERTY(CUSERCONTAINER_design) +BEGIN_PROPERTY(UserContainer_Design) Control_Design(_object, _param); @@ -1207,7 +1204,7 @@ BEGIN_PROPERTY(CUSERCONTAINER_design) END_PROPERTY -BEGIN_METHOD(CCONTAINER_find, GB_INTEGER x; GB_INTEGER y) +BEGIN_METHOD(Container_Find, GB_INTEGER x; GB_INTEGER y) QWidget *w; void *control; @@ -1226,10 +1223,10 @@ GB_DESC CChildrenDesc[] = { GB_DECLARE(".Container.Children", sizeof(CCONTAINER)), GB_VIRTUAL_CLASS(), - GB_METHOD("_next", "Control", CCONTAINER_children_next, NULL), - GB_METHOD("_get", "Control", CCONTAINER_children_get, "(Index)i"), - GB_PROPERTY_READ("Count", "i", CCONTAINER_children_count), - GB_METHOD("Clear", NULL, CCONTAINER_children_clear, NULL), + GB_METHOD("_next", "Control", Container_Children_next, NULL), + GB_METHOD("_get", "Control", Container_Children_get, "(Index)i"), + GB_PROPERTY_READ("Count", "i", Container_Children_Count), + GB_METHOD("Clear", NULL, Container_Children_Clear, NULL), GB_END_DECLARE }; @@ -1242,14 +1239,14 @@ GB_DESC CContainerDesc[] = GB_PROPERTY_SELF("Children", ".Container.Children"), - GB_PROPERTY_READ("ClientX", "i", CCONTAINER_x), - GB_PROPERTY_READ("ClientY", "i", CCONTAINER_y), - GB_PROPERTY_READ("ClientW", "i", CCONTAINER_width), - GB_PROPERTY_READ("ClientWidth", "i", CCONTAINER_width), - GB_PROPERTY_READ("ClientH", "i", CCONTAINER_height), - GB_PROPERTY_READ("ClientHeight", "i", CCONTAINER_height), + GB_PROPERTY_READ("ClientX", "i", Container_X), + GB_PROPERTY_READ("ClientY", "i", Container_Y), + GB_PROPERTY_READ("ClientW", "i", Container_Width), + GB_PROPERTY_READ("ClientWidth", "i", Container_Width), + GB_PROPERTY_READ("ClientH", "i", Container_Height), + GB_PROPERTY_READ("ClientHeight", "i", Container_Height), - GB_METHOD("Find", "Control", CCONTAINER_find, "(X)i(Y)i"), + GB_METHOD("Find", "Control", Container_Find, "(X)i(Y)i"), CONTAINER_DESCRIPTION, @@ -1266,11 +1263,11 @@ GB_DESC CUserControlDesc[] = GB_DECLARE("UserControl", sizeof(CCONTAINER)), GB_INHERITS("Container"), GB_NOT_CREATABLE(), - GB_METHOD("_new", NULL, CUSERCONTROL_new, "(Parent)Container;"), + GB_METHOD("_new", NULL, UserControl_new, "(Parent)Container;"), - GB_PROPERTY("_Container", "Container", CUSERCONTROL_container), - GB_PROPERTY("_AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("_Arrangement", "i", CCONTAINER_arrangement), + GB_PROPERTY("_Container", "Container", UserControl_Container), + GB_PROPERTY("_AutoResize", "b", Container_AutoResize), + GB_PROPERTY("_Arrangement", "i", Container_Arrangement), USERCONTROL_DESCRIPTION, @@ -1283,20 +1280,20 @@ GB_DESC CUserContainerDesc[] = GB_DECLARE("UserContainer", sizeof(CUSERCONTAINER)), GB_INHERITS("Container"), GB_NOT_CREATABLE(), - GB_METHOD("_new", NULL, CUSERCONTROL_new, "(Parent)Container;"), + GB_METHOD("_new", NULL, UserControl_new, "(Parent)Container;"), - GB_PROPERTY("_Container", "Container", CUSERCONTAINER_container), - GB_PROPERTY("_Arrangement", "i", CCONTAINER_arrangement), + GB_PROPERTY("_Container", "Container", UserContainer_Container), + GB_PROPERTY("_Arrangement", "i", Container_Arrangement), - GB_PROPERTY("Arrangement", "i", CUSERCONTAINER_arrangement), - GB_PROPERTY("AutoResize", "b", CUSERCONTAINER_auto_resize), - GB_PROPERTY("Padding", "i", CUSERCONTAINER_padding), - GB_PROPERTY("Spacing", "b", CUSERCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CUSERCONTAINER_margin), - GB_PROPERTY("Indent", "b", CUSERCONTAINER_indent), + GB_PROPERTY("Arrangement", "i", UserContainer_Arrangement), + GB_PROPERTY("AutoResize", "b", UserContainer_AutoResize), + GB_PROPERTY("Padding", "i", UserContainer_Padding), + GB_PROPERTY("Spacing", "b", UserContainer_Spacing), + GB_PROPERTY("Margin", "b", UserContainer_Margin), + GB_PROPERTY("Indent", "b", UserContainer_Indent), GB_PROPERTY("Invert", "b", UserContainer_Invert), - GB_PROPERTY("Design", "b", CUSERCONTAINER_design), + GB_PROPERTY("Design", "b", UserContainer_Design), USERCONTAINER_DESCRIPTION, diff --git a/gb.qt4/src/CContainer.h b/gb.qt4/src/CContainer.h index aff6fe34d..88a7eb130 100644 --- a/gb.qt4/src/CContainer.h +++ b/gb.qt4/src/CContainer.h @@ -96,13 +96,13 @@ typedef #endif -DECLARE_PROPERTY(CCONTAINER_arrangement); -DECLARE_PROPERTY(CCONTAINER_auto_resize); -DECLARE_PROPERTY(CCONTAINER_padding); -DECLARE_PROPERTY(CCONTAINER_spacing); -DECLARE_PROPERTY(CCONTAINER_margin); -DECLARE_PROPERTY(CCONTAINER_indent); -DECLARE_PROPERTY(CCONTAINER_border); +DECLARE_PROPERTY(Container_Arrangement); +DECLARE_PROPERTY(Container_AutoResize); +DECLARE_PROPERTY(Container_Padding); +DECLARE_PROPERTY(Container_Spacing); +DECLARE_PROPERTY(Container_Margin); +DECLARE_PROPERTY(Container_Indent); +DECLARE_PROPERTY(Container_Border); DECLARE_PROPERTY(Container_Invert); void CCONTAINER_arrange(void *_object); diff --git a/gb.qt4/src/CDrawingArea.cpp b/gb.qt4/src/CDrawingArea.cpp index 08c7cbbc7..1fb7279fc 100644 --- a/gb.qt4/src/CDrawingArea.cpp +++ b/gb.qt4/src/CDrawingArea.cpp @@ -519,7 +519,7 @@ END_PROPERTY BEGIN_PROPERTY(CDRAWINGAREA_border) - CCONTAINER_border(_object, _param); + Container_Border(_object, _param); if (!READ_PROPERTY) { @@ -609,12 +609,12 @@ GB_DESC CDrawingAreaDesc[] = GB_PROPERTY("Cached", "b", CDRAWINGAREA_cached), - GB_PROPERTY("Arrangement", "i", CCONTAINER_arrangement), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("Arrangement", "i", Container_Arrangement), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), GB_PROPERTY("Border", "i", CDRAWINGAREA_border), diff --git a/gb.qt4/src/CPanel.cpp b/gb.qt4/src/CPanel.cpp index 1b45bb90d..aee6d6ebd 100644 --- a/gb.qt4/src/CPanel.cpp +++ b/gb.qt4/src/CPanel.cpp @@ -101,13 +101,13 @@ GB_DESC CPanelDesc[] = GB_METHOD("_new", NULL, CPANEL_new, "(Parent)Container;"), - GB_PROPERTY("Border", "i", CCONTAINER_border), - GB_PROPERTY("Arrangement", "i", CCONTAINER_arrangement), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("Border", "i", Container_Border), + GB_PROPERTY("Arrangement", "i", Container_Arrangement), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), PANEL_DESCRIPTION, @@ -122,11 +122,11 @@ GB_DESC CHBoxDesc[] = GB_METHOD("_new", NULL, CHBOX_new, "(Parent)Container;"), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), HBOX_DESCRIPTION, @@ -141,11 +141,11 @@ GB_DESC CVBoxDesc[] = GB_METHOD("_new", NULL, CVBOX_new, "(Parent)Container;"), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Indent", "b", Container_Indent), VBOX_DESCRIPTION, @@ -159,11 +159,11 @@ GB_DESC CHPanelDesc[] = GB_METHOD("_new", NULL, CHPANEL_new, "(Parent)Container;"), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), HPANEL_DESCRIPTION, @@ -178,11 +178,11 @@ GB_DESC CVPanelDesc[] = GB_METHOD("_new", NULL, CVPANEL_new, "(Parent)Container;"), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), VPANEL_DESCRIPTION, diff --git a/gb.qt4/src/CScrollView.cpp b/gb.qt4/src/CScrollView.cpp index 9bb31ed74..d2df97a27 100644 --- a/gb.qt4/src/CScrollView.cpp +++ b/gb.qt4/src/CScrollView.cpp @@ -618,11 +618,11 @@ GB_DESC CScrollViewDesc[] = GB_METHOD("Scroll", NULL, CSCROLLVIEW_scroll, "(X)i(Y)i"), GB_METHOD("EnsureVisible", NULL, CSCROLLVIEW_ensure_visible, "(X)i(Y)i(Width)i(Height)i"), - GB_PROPERTY("Arrangement", "i", CCONTAINER_arrangement), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("Arrangement", "i", Container_Arrangement), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), GB_EVENT("Scroll", NULL, NULL, &EVENT_Scroll), diff --git a/gb.qt4/src/CTabStrip.cpp b/gb.qt4/src/CTabStrip.cpp index 04156177e..da0b0dc3c 100644 --- a/gb.qt4/src/CTabStrip.cpp +++ b/gb.qt4/src/CTabStrip.cpp @@ -39,8 +39,8 @@ #include "CTabStrip.h" -DECLARE_METHOD(CCONTAINER_x); -DECLARE_METHOD(CCONTAINER_y); +DECLARE_METHOD(Container_X); +DECLARE_METHOD(Container_Y); DECLARE_EVENT(EVENT_Click); DECLARE_EVENT(EVENT_Close); @@ -771,17 +771,17 @@ BEGIN_PROPERTY(TabStrip_Closable) END_PROPERTY + BEGIN_PROPERTY(CTABSTRIP_client_x) - CCONTAINER_x(_object, _param); + Container_X(_object, _param); END_PROPERTY - BEGIN_PROPERTY(CTABSTRIP_client_y) - CCONTAINER_y(_object, _param); + Container_Y(_object, _param); END_PROPERTY @@ -894,12 +894,12 @@ GB_DESC CTabStripDesc[] = GB_PROPERTY_READ("ClientH", "i", CTABSTRIP_client_height), GB_PROPERTY_READ("ClientHeight", "i", CTABSTRIP_client_height), - GB_PROPERTY("Arrangement", "i", CCONTAINER_arrangement), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("Indent", "b", CCONTAINER_indent), + GB_PROPERTY("Arrangement", "i", Container_Arrangement), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("Indent", "b", Container_Indent), GB_PROPERTY("Invert", "b", Container_Invert), GB_METHOD("_get", ".Tab", CTABSTRIP_get, "(Index)i"), diff --git a/gb.qt4/src/CWidget.cpp b/gb.qt4/src/CWidget.cpp index c6704a1ac..a624e462d 100644 --- a/gb.qt4/src/CWidget.cpp +++ b/gb.qt4/src/CWidget.cpp @@ -219,7 +219,7 @@ static bool is_visible(void *_object) return THIS->flag.visible; // || !QWIDGET(_object)->isHidden(); } -static void register_proxy(void *_object, void *proxy) +void CWIDGET_register_proxy(void *_object, void *proxy) { void *check = proxy; @@ -1452,7 +1452,7 @@ BEGIN_PROPERTY(Control_Proxy) if (READ_PROPERTY) GB.ReturnObject(THIS->proxy); else - register_proxy(THIS, VPROP(GB_OBJECT)); + CWIDGET_register_proxy(THIS, VPROP(GB_OBJECT)); END_PROPERTY diff --git a/gb.qt4/src/CWidget.h b/gb.qt4/src/CWidget.h index 33d8f2af3..3eb38271d 100644 --- a/gb.qt4/src/CWidget.h +++ b/gb.qt4/src/CWidget.h @@ -190,6 +190,7 @@ void CWIDGET_move_cached(void *_object, int x, int y); void CWIDGET_resize_cached(void *_object, int w, int h); void CWIDGET_move_resize_cached(void *_object, int x, int y, int w, int h); void CWIDGET_handle_focus(CWIDGET *control, bool on); +void CWIDGET_register_proxy(void *_object, void *proxy); void CACTION_register(void *control, const char *old, const char *key); void CACTION_raise(void *control); diff --git a/gb.qt4/src/CWindow.cpp b/gb.qt4/src/CWindow.cpp index 2ef396b15..891817668 100644 --- a/gb.qt4/src/CWindow.cpp +++ b/gb.qt4/src/CWindow.cpp @@ -1496,11 +1496,11 @@ GB_DESC CWindowDesc[] = GB_PROPERTY("Visible", "b", CWINDOW_visible), GB_PROPERTY("Opacity", "i", Window_Opacity), - GB_PROPERTY("Arrangement", "i", CCONTAINER_arrangement), - GB_PROPERTY("Padding", "i", CCONTAINER_padding), - GB_PROPERTY("Spacing", "b", CCONTAINER_spacing), - GB_PROPERTY("Margin", "b", CCONTAINER_margin), - GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), + GB_PROPERTY("Arrangement", "i", Container_Arrangement), + GB_PROPERTY("Padding", "i", Container_Padding), + GB_PROPERTY("Spacing", "b", Container_Spacing), + GB_PROPERTY("Margin", "b", Container_Margin), + GB_PROPERTY("AutoResize", "b", Container_AutoResize), GB_PROPERTY("Invert", "b", Container_Invert), //GB_PROPERTY("Type", "i", CWINDOW_type),