From fbeabc23e0ae133412810c33a4700075e8bcd884 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Sep 2008 14:23:05 +0000 Subject: [PATCH] Updated wrappers of osgWidget --- src/osgWrappers/genwrapper.conf | 2 ++ src/osgWrappers/osgWidget/Box.cpp | 5 ----- src/osgWrappers/osgWidget/Canvas.cpp | 5 ----- src/osgWrappers/osgWidget/EventInterface.cpp | 5 +++++ src/osgWrappers/osgWidget/Frame.cpp | 15 --------------- src/osgWrappers/osgWidget/Label.cpp | 5 ----- src/osgWrappers/osgWidget/Table.cpp | 9 ++------- src/osgWrappers/osgWidget/ViewerEventHandlers.cpp | 8 ++++++-- src/osgWrappers/osgWidget/Widget.cpp | 5 ----- src/osgWrappers/osgWidget/Window.cpp | 13 ++----------- src/osgWrappers/osgWidget/WindowManager.cpp | 1 - 11 files changed, 17 insertions(+), 56 deletions(-) diff --git a/src/osgWrappers/genwrapper.conf b/src/osgWrappers/genwrapper.conf index a9d053e7a..469f53bfd 100644 --- a/src/osgWrappers/genwrapper.conf +++ b/src/osgWrappers/genwrapper.conf @@ -49,6 +49,8 @@ suppress reflector "osgUtil::MultiplyRangeFunctor" suppress reflector "CPluginFunction" suppress reflector "PluginFunctionProxy" +suppress reflector "osgWidget::UIObjectParent" + ############################################################################# configure file /osg\/GraphicsContext/ diff --git a/src/osgWrappers/osgWidget/Box.cpp b/src/osgWrappers/osgWidget/Box.cpp index 3fc63883d..366d706a0 100644 --- a/src/osgWrappers/osgWidget/Box.cpp +++ b/src/osgWrappers/osgWidget/Box.cpp @@ -56,11 +56,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Box) __C5_char_P1__className, "return the name of the node's class type. ", ""); - I_Method1(, META_UIObject, IN, osgWidget::Box, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Box, - "", - ""); I_ConstructorWithDefaults3(IN, const std::string &, x, "", IN, osgWidget::Box::BOX_TYPE, x, osgWidget::Box::HORIZONTAL, IN, bool, x, false, ____Box__C5_std_string_R1__BOX_TYPE__bool, "", diff --git a/src/osgWrappers/osgWidget/Canvas.cpp b/src/osgWrappers/osgWidget/Canvas.cpp index d80cf504e..9ceb01375 100644 --- a/src/osgWrappers/osgWidget/Canvas.cpp +++ b/src/osgWrappers/osgWidget/Canvas.cpp @@ -52,11 +52,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Canvas) __C5_char_P1__className, "return the name of the node's class type. ", ""); - I_Method1(, META_UIObject, IN, osgWidget::Canvas, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Canvas, - "", - ""); I_ConstructorWithDefaults1(IN, const std::string &, x, "", Properties::NON_EXPLICIT, ____Canvas__C5_std_string_R1, diff --git a/src/osgWrappers/osgWidget/EventInterface.cpp b/src/osgWrappers/osgWidget/EventInterface.cpp index d04139b60..4c87e2e9c 100644 --- a/src/osgWrappers/osgWidget/EventInterface.cpp +++ b/src/osgWrappers/osgWidget/EventInterface.cpp @@ -28,6 +28,11 @@ BEGIN_VALUE_REFLECTOR(osgWidget::Callback) I_Constructor0(____Callback, "", ""); + I_Constructor1(IN, const osgWidget::Callback &, rhs, + Properties::NON_EXPLICIT, + ____Callback__C5_Callback_R1, + "", + ""); I_Method0(osgWidget::EventType, getType, Properties::NON_VIRTUAL, __EventType__getType, diff --git a/src/osgWrappers/osgWidget/Frame.cpp b/src/osgWrappers/osgWidget/Frame.cpp index b3cfeb428..dbccf97c3 100644 --- a/src/osgWrappers/osgWidget/Frame.cpp +++ b/src/osgWrappers/osgWidget/Frame.cpp @@ -69,11 +69,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Frame) __C5_char_P1__className, "return the name of the node's class type. ", ""); - I_Method1(, META_UIObject, IN, osgWidget::Frame, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Frame, - "", - ""); I_ConstructorWithDefaults1(IN, const std::string &, x, "", Properties::NON_EXPLICIT, ____Frame__C5_std_string_R1, @@ -197,11 +192,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Frame::Border) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(, META_UIObject, IN, osgWidget::Frame::Border, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Border, - "", - ""); I_ConstructorWithDefaults3(IN, osgWidget::Frame::BORDER, x, osgWidget::Frame::BORDER_LEFT, IN, osgWidget::point_type, x, 0.0f, IN, osgWidget::point_type, x, 0.0f, ____Border__BORDER__point_type__point_type, "", @@ -266,11 +256,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Frame::Corner) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(, META_UIObject, IN, osgWidget::Frame::Corner, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Corner, - "", - ""); I_ConstructorWithDefaults3(IN, osgWidget::Frame::CORNER, x, osgWidget::Frame::CORNER_LOWER_LEFT, IN, osgWidget::point_type, x, 0.0f, IN, osgWidget::point_type, x, 0.0f, ____Corner__CORNER__point_type__point_type, "", diff --git a/src/osgWrappers/osgWidget/Label.cpp b/src/osgWrappers/osgWidget/Label.cpp index a2a25d750..171a04b1f 100644 --- a/src/osgWrappers/osgWidget/Label.cpp +++ b/src/osgWrappers/osgWidget/Label.cpp @@ -54,11 +54,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Label) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(, META_UIObject, IN, osgWidget::Label, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Label, - "", - ""); I_ConstructorWithDefaults2(IN, const std::string &, x, "", IN, const std::string &, x, "", ____Label__C5_std_string_R1__C5_std_string_R1, "", diff --git a/src/osgWrappers/osgWidget/Table.cpp b/src/osgWrappers/osgWidget/Table.cpp index b4f5ca057..f362bf473 100644 --- a/src/osgWrappers/osgWidget/Table.cpp +++ b/src/osgWrappers/osgWidget/Table.cpp @@ -54,11 +54,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Table) __C5_char_P1__className, "return the name of the node's class type. ", ""); - I_Method1(, META_UIObject, IN, osgWidget::Table, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Table, - "", - ""); I_ConstructorWithDefaults3(IN, const std::string &, x, "", IN, unsigned, int, 0, IN, unsigned, int, 0, ____Table__C5_std_string_R1__unsigned__unsigned, "", @@ -133,13 +128,13 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Table) __unsigned_int___calculateIndex__unsigned__unsigned, "", ""); - I_ProtectedMethod2(void, _getRows, IN, osgWidget::Table::CellSizes &, x, IN, Getter, x, + I_ProtectedMethod2(void, _getRows, IN, osgWidget::Table::CellSizes &, x, IN, osgWidget::Window::Getter, x, Properties::NON_VIRTUAL, Properties::CONST, __void___getRows__CellSizes_R1__Getter, "", ""); - I_ProtectedMethod2(void, _getColumns, IN, osgWidget::Table::CellSizes &, x, IN, Getter, x, + I_ProtectedMethod2(void, _getColumns, IN, osgWidget::Table::CellSizes &, x, IN, osgWidget::Window::Getter, x, Properties::NON_VIRTUAL, Properties::CONST, __void___getColumns__CellSizes_R1__Getter, diff --git a/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp b/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp index 8a1302287..c1be780ed 100644 --- a/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp @@ -41,6 +41,10 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::KeyboardHandler) ""); END_REFLECTOR +TYPE_NAME_ALIAS(bool(osgWidget::MouseHandler::*), osgWidget::MouseHandler::MouseAction) + +TYPE_NAME_ALIAS(bool(osgWidget::WindowManager::*), osgWidget::MouseHandler::MouseEvent) + BEGIN_OBJECT_REFLECTOR(osgWidget::MouseHandler) I_DeclaringFile("osgWidget/ViewerEventHandlers"); I_BaseType(osgGA::GUIEventHandler); @@ -90,13 +94,13 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::MouseHandler) __bool___handleMouseScroll__float__float__int, "", ""); - I_ProtectedMethod1(MouseAction, _isMouseEvent, IN, osgGA::GUIEventAdapter::EventType, x, + I_ProtectedMethod1(osgWidget::MouseHandler::MouseAction, _isMouseEvent, IN, osgGA::GUIEventAdapter::EventType, x, Properties::NON_VIRTUAL, Properties::CONST, __MouseAction___isMouseEvent__osgGA_GUIEventAdapter_EventType, "", ""); - I_ProtectedMethod3(bool, _doMouseEvent, IN, float, x, IN, float, x, IN, MouseEvent, x, + I_ProtectedMethod3(bool, _doMouseEvent, IN, float, x, IN, float, x, IN, osgWidget::MouseHandler::MouseEvent, x, Properties::NON_VIRTUAL, Properties::NON_CONST, __bool___doMouseEvent__float__float__MouseEvent, diff --git a/src/osgWrappers/osgWidget/Widget.cpp b/src/osgWrappers/osgWidget/Widget.cpp index f46f8a753..b270f16ff 100644 --- a/src/osgWrappers/osgWidget/Widget.cpp +++ b/src/osgWrappers/osgWidget/Widget.cpp @@ -292,11 +292,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(, META_UIObject, IN, osgWidget::Widget, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Widget, - "", - ""); I_Method1(void, parented, IN, osgWidget::Window *, x, Properties::VIRTUAL, __void__parented__Window_P1, diff --git a/src/osgWrappers/osgWidget/Window.cpp b/src/osgWrappers/osgWidget/Window.cpp index 8df668b80..3a347af1b 100644 --- a/src/osgWrappers/osgWidget/Window.cpp +++ b/src/osgWrappers/osgWidget/Window.cpp @@ -29,6 +29,8 @@ TYPE_NAME_ALIAS(std::list< osg::observer_ptr< osgWidget::Window > >, osgWidget::Window::WindowList) +TYPE_NAME_ALIAS(osgWidget::point_type(osgWidget::Widget::*), osgWidget::Window::Getter) + BEGIN_ENUM_REFLECTOR(osgWidget::Window::Strata) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::STRATA_NONE); @@ -62,14 +64,8 @@ END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) I_DeclaringFile("osgWidget/Window"); I_BaseType(osg::MatrixTransform); - I_BaseType(osgWidget::UIObjectParent); I_BaseType(osgWidget::EventInterface); I_BaseType(osgWidget::StyleInterface); - I_Method1(, META_UIObject, IN, osgWidget::Window, x, - Properties::NON_VIRTUAL, - ____META_UIObject__Window, - "", - ""); I_ConstructorWithDefaults1(IN, const std::string &, x, "", Properties::NON_EXPLICIT, ____Window__C5_std_string_R1, @@ -860,11 +856,6 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Window::EmbeddedWindow) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(, META_UIObject, IN, osgWidget::Window::EmbeddedWindow, x, - Properties::NON_VIRTUAL, - ____META_UIObject__EmbeddedWindow, - "", - ""); I_ConstructorWithDefaults3(IN, const std::string &, x, "", IN, osgWidget::point_type, x, 0.0f, IN, osgWidget::point_type, x, 0.0f, ____EmbeddedWindow__C5_std_string_R1__point_type__point_type, "", diff --git a/src/osgWrappers/osgWidget/WindowManager.cpp b/src/osgWrappers/osgWidget/WindowManager.cpp index 9397e15e0..62859b7c8 100644 --- a/src/osgWrappers/osgWidget/WindowManager.cpp +++ b/src/osgWrappers/osgWidget/WindowManager.cpp @@ -59,7 +59,6 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgWidget::WindowManager) I_DeclaringFile("osgWidget/WindowManager"); I_BaseType(osg::Switch); - I_BaseType(osgWidget::UIObjectParent); I_Method0(osg::Object *, cloneType, Properties::VIRTUAL, __osg_Object_P1__cloneType,