diff --git a/examples/osgwidgetcanvas/osgwidgetcanvas.cpp b/examples/osgwidgetcanvas/osgwidgetcanvas.cpp index fc9f38be9..ad2fb8a22 100644 --- a/examples/osgwidgetcanvas/osgwidgetcanvas.cpp +++ b/examples/osgwidgetcanvas/osgwidgetcanvas.cpp @@ -42,7 +42,7 @@ bool widgetMouseOver(osgWidget::Event& event) { osgWidget::Widget* createWidget( const std::string& name, osgWidget::color_type col, - osgWidget::Widget::LAYER layer + osgWidget::Widget::Layer layer ) { osgWidget::Widget* widget = new osgWidget::Widget(name, 200.0f, 200.0f); diff --git a/examples/osgwidgetshader/osgwidgetshader.cpp b/examples/osgwidgetshader/osgwidgetshader.cpp index b5eec74ce..af1e2ec69 100644 --- a/examples/osgwidgetshader/osgwidgetshader.cpp +++ b/examples/osgwidgetshader/osgwidgetshader.cpp @@ -11,7 +11,7 @@ const unsigned int MASK_2D = 0xF0000000; osgWidget::Widget* createWidget( const std::string& name, osgWidget::color_type col, - osgWidget::Widget::LAYER layer + osgWidget::Widget::Layer layer ) { osgWidget::Widget* widget = new osgWidget::Widget(name, 200.0f, 200.0f); diff --git a/include/osgWidget/EventInterface b/include/osgWidget/EventInterface index 8002b1e78..c0a7f66b6 100644 --- a/include/osgWidget/EventInterface +++ b/include/osgWidget/EventInterface @@ -29,7 +29,7 @@ class WindowManager; class Window; class Widget; -enum EVENT_TYPE +enum EventType { EVENT_NONE = 0x0000, EVENT_FOCUS = 0x0001, @@ -48,7 +48,7 @@ enum EVENT_TYPE // Helpful wrapper around using the raw types, since it often doesn't make sense to // use some without the others. -enum EVENT_MASK +enum EventMask { EVENT_MASK_FOCUS = EVENT_FOCUS | EVENT_UNFOCUS, EVENT_MASK_MOUSE_MOVE = EVENT_MOUSE_ENTER | EVENT_MOUSE_OVER | EVENT_MOUSE_LEAVE, @@ -60,13 +60,13 @@ enum EVENT_MASK class OSGWIDGET_EXPORT Event { public: - EVENT_TYPE type; + EventType type; double x; double y; int key; int keyMask; - Event(WindowManager* wm, EVENT_TYPE _type = EVENT_NONE): + Event(WindowManager* wm, EventType _type = EVENT_NONE): _wm (wm), _window (0), _widget (0), @@ -78,13 +78,13 @@ class OSGWIDGET_EXPORT Event keyMask (-1) { } - Event& makeType(EVENT_TYPE _type) { + Event& makeType(EventType _type) { if(_type != EVENT_NONE) type = _type; return *this; } - Event& makeMouse(double _x, double _y, EVENT_TYPE _type = EVENT_NONE) { + Event& makeMouse(double _x, double _y, EventType _type = EVENT_NONE) { x = _x; y = _y; @@ -93,7 +93,7 @@ class OSGWIDGET_EXPORT Event return *this; } - Event& makeKey(int _key, int _keyMask, EVENT_TYPE _type = EVENT_NONE) { + Event& makeKey(int _key, int _keyMask, EventType _type = EVENT_NONE) { key = _key; keyMask = _keyMask; @@ -208,7 +208,7 @@ class OSGWIDGET_EXPORT Callback public: // Creates a Callback that is bound to a member function. template - Callback(bool (T::*function)(Event&), T* obj, EVENT_TYPE type, void* data=0): + Callback(bool (T::*function)(Event&), T* obj, EventType type, void* data=0): _type (type), _data (data), _callback (new ObjectCallback(function, obj)) { @@ -216,7 +216,7 @@ class OSGWIDGET_EXPORT Callback // Creates a Callback that is bound to a functor pointer. template - Callback(T* functor, EVENT_TYPE type, void* data=0): + Callback(T* functor, EventType type, void* data=0): _type (type), _data (data), _callback (new FunctionCallback(functor)) { @@ -226,7 +226,7 @@ class OSGWIDGET_EXPORT Callback return (*_callback)(ev); } - EVENT_TYPE getType() const { + EventType getType() const { return _type; } @@ -238,7 +238,7 @@ class OSGWIDGET_EXPORT Callback return _data; } protected: - EVENT_TYPE _type; + EventType _type; void* _data; // We use a ref_ptr here so that we don't have to worry about memory. diff --git a/include/osgWidget/StyleManager b/include/osgWidget/StyleManager index e0d6c8909..19c5f7ce6 100644 --- a/include/osgWidget/StyleManager +++ b/include/osgWidget/StyleManager @@ -57,10 +57,10 @@ class OSGWIDGET_EXPORT Style: public osg::Object return _style; } - static Widget::LAYER strToLayer (const std::string&); - static Widget::VERTICAL_ALIGNMENT strToVAlign (const std::string&); - static Widget::HORIZONTAL_ALIGNMENT strToHAlign (const std::string&); - static Widget::COORDINATE_MODE strToCoordMode (const std::string&); + static Widget::Layer strToLayer (const std::string&); + static Widget::VerticalAlignment strToVAlign (const std::string&); + static Widget::HorizontalAlignment strToHAlign (const std::string&); + static Widget::CoordinateMode strToCoordMode (const std::string&); static bool strToFill (const std::string&); protected: diff --git a/include/osgWidget/Widget b/include/osgWidget/Widget index 766cb9bc7..04e307361 100644 --- a/include/osgWidget/Widget +++ b/include/osgWidget/Widget @@ -35,7 +35,7 @@ class WindowManager; // or relative). class OSGWIDGET_EXPORT Widget: public osg::Geometry, public EventInterface, public StyleInterface { public: - enum POINT { + enum Corner { LOWER_LEFT = 0, LOWER_RIGHT = 1, UPPER_RIGHT = 2, @@ -44,10 +44,10 @@ public: LR = LOWER_RIGHT, UR = UPPER_RIGHT, UL = UPPER_LEFT, - ALL_POINTS = 4 + ALL_CORNERS = 4 }; - enum LAYER { + enum Layer { LAYER_TOP = 20, LAYER_HIGH = 15, LAYER_MIDDLE = 10, @@ -55,19 +55,19 @@ public: LAYER_BG = 0 }; - enum VERTICAL_ALIGNMENT { + enum VerticalAlignment { VA_CENTER, VA_TOP, VA_BOTTOM }; - enum HORIZONTAL_ALIGNMENT { + enum HorizontalAlignment { HA_CENTER, HA_LEFT, HA_RIGHT }; - enum COORDINATE_MODE { + enum CoordinateMode { CM_ABSOLUTE, CM_RELATIVE }; @@ -116,9 +116,9 @@ public: ); void setPadding (point_type); - void setColor (color_type, color_type, color_type, color_type, POINT = ALL_POINTS); - void addColor (color_type, color_type, color_type, color_type, POINT = ALL_POINTS); - void setTexCoord (texcoord_type, texcoord_type, POINT = ALL_POINTS); + void setColor (color_type, color_type, color_type, color_type, Corner = ALL_CORNERS); + void addColor (color_type, color_type, color_type, color_type, Corner = ALL_CORNERS); + void setTexCoord (texcoord_type, texcoord_type, Corner = ALL_CORNERS); // These are additional texture coordinate setting methods. // This method will use a given origin as the LOWER_LEFT point and texture the @@ -147,11 +147,11 @@ public: point_type getPadHorizontal () const; point_type getPadVertical () const; - const Point& getPoint (POINT = ALL_POINTS) const; - const Color& getColor (POINT = ALL_POINTS) const; - const TexCoord& getTexCoord (POINT = ALL_POINTS) const; + const Point& getPoint (Corner = ALL_CORNERS) const; + const Color& getColor (Corner = ALL_CORNERS) const; + const TexCoord& getTexCoord (Corner = ALL_CORNERS) const; - POINT convertPoint (POINT) const; + Corner convertCorner (Corner) const; Color getImageColorAtXY (point_type x, point_type y) const; XYCoord localXY (double, double) const; @@ -206,11 +206,11 @@ public: setSize(xy.x(), xy.y()); } - void setColor(const Color& col, POINT p = ALL_POINTS) { + void setColor(const Color& col, Corner p = ALL_CORNERS) { setColor(col.r(), col.g(), col.b(), col.a(), p); } - void setTexCoord(const XYCoord& xy, POINT p = ALL_POINTS) { + void setTexCoord(const XYCoord& xy, Corner p = ALL_CORNERS) { setTexCoord(xy.x(), xy.y(), p); } @@ -218,7 +218,7 @@ public: setTexCoordRegion(xy.x(), xy.y(), w, h); } - void addColor(const Color& col, POINT p = ALL_POINTS) { + void addColor(const Color& col, Corner p = ALL_CORNERS) { addColor(col.r(), col.g(), col.b(), col.a(), p); } @@ -240,7 +240,7 @@ public: } // TODO: Refine this... - void setLayer(LAYER l, unsigned int offset = 0) { + void setLayer(Layer l, unsigned int offset = 0) { _layer = l + offset; } @@ -260,15 +260,15 @@ public: _padBottom = p; } - void setAlignHorizontal(HORIZONTAL_ALIGNMENT h) { + void setAlignHorizontal(HorizontalAlignment h) { _halign = h; } - void setAlignVertical(VERTICAL_ALIGNMENT v) { + void setAlignVertical(VerticalAlignment v) { _valign = v; } - void setCoordinateMode(COORDINATE_MODE cm) { + void setCoordinateMode(CoordinateMode cm) { _coordMode = cm; } @@ -340,15 +340,15 @@ public: return _padBottom; } - HORIZONTAL_ALIGNMENT getAlignHorizontal() const { + HorizontalAlignment getAlignHorizontal() const { return _halign; } - VERTICAL_ALIGNMENT getAlignVertical() const { + VerticalAlignment getAlignVertical() const { return _valign; } - COORDINATE_MODE getCoordinateMode() const { + CoordinateMode getCoordinateMode() const { return _coordMode; } @@ -461,11 +461,11 @@ public: point_type _padBottom; // The alignments are used in conjuction when the widget is NOT set to fill. - VERTICAL_ALIGNMENT _valign; - HORIZONTAL_ALIGNMENT _halign; + VerticalAlignment _valign; + HorizontalAlignment _halign; // This flag determines how sizing values are interpretted by setDimensions(). - COORDINATE_MODE _coordMode; + CoordinateMode _coordMode; // These are the relative values, which are not stored directly in our verts // array but kept around for calculation later. diff --git a/include/osgWidget/Window b/include/osgWidget/Window index e464f4354..c13a8e50c 100644 --- a/include/osgWidget/Window +++ b/include/osgWidget/Window @@ -88,18 +88,18 @@ class OSGWIDGET_EXPORT Window: // These correspond to special regions honored by the WindowManager. Most Windows // will want to be NONE, unless they need to exist in the foreground or background // for some reason. - enum STRATA { + enum Strata { STRATA_NONE, STRATA_BACKGROUND, STRATA_FOREGROUND }; // If you only want to display a portion of a Window (such as when it is embedded), - // you will need to set the VISIBILITY_MODE to WM_PARTIAL. Otherwise, the entire + // you will need to set the VisibilityMode to WM_PARTIAL. Otherwise, the entire // Window is visible by default. The final enum, VM_ENTIRE, says that no Scissoring // should take place at all, and is useful in cases where you want to properly // scale or rotate Windows. - enum VISIBILITY_MODE { + enum VisibilityMode { VM_FULL, VM_PARTIAL, VM_ENTIRE @@ -109,14 +109,14 @@ class OSGWIDGET_EXPORT Window: // call to Window::update() that allow us to position a Window somewhere relative // to the WindowManger's viewable area. However, unlike the ALIGNMENT enums, these // are totally optional (whereas a Widget must always have some ALIGNMENT value set. - enum VERTICAL_ANCHOR { + enum VerticalAnchor { VA_NONE, VA_CENTER, VA_TOP, VA_BOTTOM }; - enum HORIZONTAL_ANCHOR { + enum HorizontalAnchor { HA_NONE, HA_CENTER, HA_LEFT, @@ -256,11 +256,11 @@ class OSGWIDGET_EXPORT Window: return _height.min; } - VERTICAL_ANCHOR getAnchorVertical() const { + VerticalAnchor getAnchorVertical() const { return _vAnchor; } - HORIZONTAL_ANCHOR getAnchorHorizontal() const { + HorizontalAnchor getAnchorHorizontal() const { return _hAnchor; } @@ -280,7 +280,7 @@ class OSGWIDGET_EXPORT Window: return _zRange; } - STRATA getStrata() const { + Strata getStrata() const { return _strata; } @@ -288,7 +288,7 @@ class OSGWIDGET_EXPORT Window: return _visibleArea; } - VISIBILITY_MODE getVisibilityMode() const { + VisibilityMode getVisibilityMode() const { return _vis; } @@ -343,19 +343,19 @@ class OSGWIDGET_EXPORT Window: _scaleDenom = sd; } - void setAnchorVertical(VERTICAL_ANCHOR va) { + void setAnchorVertical(VerticalAnchor va) { _vAnchor = va; } - void setAnchorHorizontal(HORIZONTAL_ANCHOR ha) { + void setAnchorHorizontal(HorizontalAnchor ha) { _hAnchor = ha; } - void setStrata(STRATA s) { + void setStrata(Strata s) { _strata = s; } - void setVisibilityMode(VISIBILITY_MODE v) { + void setVisibilityMode(VisibilityMode v) { _vis = v; } @@ -429,11 +429,11 @@ class OSGWIDGET_EXPORT Window: // This is a special value that can be used to "force" a Window not to be // focusable and instead always exist in the foreground or background. - STRATA _strata; + Strata _strata; // A flag determining whether our visible area is the full Window or rather // a portion of the Window. - VISIBILITY_MODE _vis; + VisibilityMode _vis; // A rotation value in degrees. matrix_type _r; @@ -446,8 +446,8 @@ class OSGWIDGET_EXPORT Window: Sizes _width; Sizes _height; - VERTICAL_ANCHOR _vAnchor; - HORIZONTAL_ANCHOR _hAnchor; + VerticalAnchor _vAnchor; + HorizontalAnchor _hAnchor; // Not all windows have widgets that can focus, but if they do this should // be a pointer to it. diff --git a/include/osgWidget/WindowManager b/include/osgWidget/WindowManager index caa823264..bf79d91ae 100644 --- a/include/osgWidget/WindowManager +++ b/include/osgWidget/WindowManager @@ -39,7 +39,7 @@ typedef osgUtil::LineSegmentIntersector::Intersections Intersections; // and performs keyboard input on the currently focused Window->Widget. class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent { public: - enum WM_FLAGS { + enum WmFlags { WM_USE_LUA = 0x00000001, WM_USE_PYTHON = 0x00000002, WM_PICK_DEBUG = 0x00000004, @@ -47,7 +47,7 @@ class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent< WM_NO_BETA_WARN = 0x00000010 }; - enum POINTER_DIRECTION { + enum PointerDirection { PD_NONE = 0x00000000, PD_LEFT = 0x00000001, PD_RIGHT = 0x00000002, @@ -55,7 +55,7 @@ class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent< PD_DOWN = 0x00000008 }; - enum POINTER_FOCUS_MODE { + enum PointerFocusMode { PFM_FOCUS = 0x00000000, PFM_UNFOCUS = 0x00000001, PFM_SLOPPY = 0x00000002 @@ -157,15 +157,15 @@ class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent< return _styleManager.get(); } - POINTER_DIRECTION getPointerVerticalDirection() const { + PointerDirection getPointerVerticalDirection() const { return _lastVertical; } - POINTER_DIRECTION getPointerHorizontalDirection() const { + PointerDirection getPointerHorizontalDirection() const { return _lastHorizontal; } - POINTER_FOCUS_MODE getPointerFocusMode() const { + PointerFocusMode getPointerFocusMode() const { return _focusMode; } @@ -225,7 +225,7 @@ class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent< _scrolling = sm; } - void setPointerFocusMode(POINTER_FOCUS_MODE pfm) { + void setPointerFocusMode(PointerFocusMode pfm) { _focusMode = pfm; } @@ -295,9 +295,9 @@ class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent< float _lastY; EventInterface* _lastEvent; EventInterface* _lastPush; - POINTER_DIRECTION _lastVertical; - POINTER_DIRECTION _lastHorizontal; - POINTER_FOCUS_MODE _focusMode; + PointerDirection _lastVertical; + PointerDirection _lastHorizontal; + PointerFocusMode _focusMode; bool _leftDown; bool _middleDown; bool _rightDown; diff --git a/src/osgWrappers/osgWidget/EventInterface.cpp b/src/osgWrappers/osgWidget/EventInterface.cpp index e4a0f2196..d04139b60 100644 --- a/src/osgWrappers/osgWidget/EventInterface.cpp +++ b/src/osgWrappers/osgWidget/EventInterface.cpp @@ -28,9 +28,9 @@ BEGIN_VALUE_REFLECTOR(osgWidget::Callback) I_Constructor0(____Callback, "", ""); - I_Method0(osgWidget::EVENT_TYPE, getType, + I_Method0(osgWidget::EventType, getType, Properties::NON_VIRTUAL, - __EVENT_TYPE__getType, + __EventType__getType, "", ""); I_Method0(void *, getData, @@ -46,8 +46,8 @@ BEGIN_VALUE_REFLECTOR(osgWidget::Callback) I_SimpleProperty(void *, Data, __void_P1__getData, 0); - I_SimpleProperty(osgWidget::EVENT_TYPE, Type, - __EVENT_TYPE__getType, + I_SimpleProperty(osgWidget::EventType, Type, + __EventType__getType, 0); END_REFLECTOR @@ -61,23 +61,23 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgWidget::Event) I_DeclaringFile("osgWidget/EventInterface"); - I_ConstructorWithDefaults2(IN, osgWidget::WindowManager *, wm, , IN, osgWidget::EVENT_TYPE, _type, osgWidget::EVENT_NONE, - ____Event__WindowManager_P1__EVENT_TYPE, + I_ConstructorWithDefaults2(IN, osgWidget::WindowManager *, wm, , IN, osgWidget::EventType, _type, osgWidget::EVENT_NONE, + ____Event__WindowManager_P1__EventType, "", ""); - I_Method1(osgWidget::Event &, makeType, IN, osgWidget::EVENT_TYPE, _type, + I_Method1(osgWidget::Event &, makeType, IN, osgWidget::EventType, _type, Properties::NON_VIRTUAL, - __Event_R1__makeType__EVENT_TYPE, + __Event_R1__makeType__EventType, "", ""); - I_MethodWithDefaults3(osgWidget::Event &, makeMouse, IN, double, _x, , IN, double, _y, , IN, osgWidget::EVENT_TYPE, _type, osgWidget::EVENT_NONE, + I_MethodWithDefaults3(osgWidget::Event &, makeMouse, IN, double, _x, , IN, double, _y, , IN, osgWidget::EventType, _type, osgWidget::EVENT_NONE, Properties::NON_VIRTUAL, - __Event_R1__makeMouse__double__double__EVENT_TYPE, + __Event_R1__makeMouse__double__double__EventType, "", ""); - I_MethodWithDefaults3(osgWidget::Event &, makeKey, IN, int, _key, , IN, int, _keyMask, , IN, osgWidget::EVENT_TYPE, _type, osgWidget::EVENT_NONE, + I_MethodWithDefaults3(osgWidget::Event &, makeKey, IN, int, _key, , IN, int, _keyMask, , IN, osgWidget::EventType, _type, osgWidget::EVENT_NONE, Properties::NON_VIRTUAL, - __Event_R1__makeKey__int__int__EVENT_TYPE, + __Event_R1__makeKey__int__int__EventType, "", ""); I_Method0(osgWidget::WindowManager *, getWindowManager, @@ -137,7 +137,7 @@ BEGIN_VALUE_REFLECTOR(osgWidget::Event) I_SimpleProperty(osgWidget::WindowManager *, WindowManager, __WindowManager_P1__getWindowManager, 0); - I_PublicMemberProperty(osgWidget::EVENT_TYPE, type); + I_PublicMemberProperty(osgWidget::EventType, type); I_PublicMemberProperty(double, x); I_PublicMemberProperty(double, y); I_PublicMemberProperty(int, key); @@ -304,7 +304,7 @@ BEGIN_VALUE_REFLECTOR(osgWidget::EventInterface) __void__setEventMask__unsigned_int); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::EVENT_TYPE) +BEGIN_ENUM_REFLECTOR(osgWidget::EventType) I_DeclaringFile("osgWidget/EventInterface"); I_EnumLabel(osgWidget::EVENT_NONE); I_EnumLabel(osgWidget::EVENT_FOCUS); @@ -321,7 +321,7 @@ BEGIN_ENUM_REFLECTOR(osgWidget::EVENT_TYPE) I_EnumLabel(osgWidget::EVENT_ALL); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::EVENT_MASK) +BEGIN_ENUM_REFLECTOR(osgWidget::EventMask) I_DeclaringFile("osgWidget/EventInterface"); I_EnumLabel(osgWidget::EVENT_MASK_FOCUS); I_EnumLabel(osgWidget::EVENT_MASK_MOUSE_MOVE); diff --git a/src/osgWrappers/osgWidget/StyleManager.cpp b/src/osgWrappers/osgWidget/StyleManager.cpp index 7ed1aaa62..0afccce88 100644 --- a/src/osgWrappers/osgWidget/StyleManager.cpp +++ b/src/osgWrappers/osgWidget/StyleManager.cpp @@ -119,20 +119,20 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Style) __C5_std_string_R1__getStyle, "", ""); - I_StaticMethod1(osgWidget::Widget::LAYER, strToLayer, IN, const std::string &, x, - __Widget_LAYER__strToLayer__C5_std_string_R1_S, + I_StaticMethod1(osgWidget::Widget::Layer, strToLayer, IN, const std::string &, x, + __Widget_Layer__strToLayer__C5_std_string_R1_S, "", ""); - I_StaticMethod1(osgWidget::Widget::VERTICAL_ALIGNMENT, strToVAlign, IN, const std::string &, x, - __Widget_VERTICAL_ALIGNMENT__strToVAlign__C5_std_string_R1_S, + I_StaticMethod1(osgWidget::Widget::VerticalAlignment, strToVAlign, IN, const std::string &, x, + __Widget_VerticalAlignment__strToVAlign__C5_std_string_R1_S, "", ""); - I_StaticMethod1(osgWidget::Widget::HORIZONTAL_ALIGNMENT, strToHAlign, IN, const std::string &, x, - __Widget_HORIZONTAL_ALIGNMENT__strToHAlign__C5_std_string_R1_S, + I_StaticMethod1(osgWidget::Widget::HorizontalAlignment, strToHAlign, IN, const std::string &, x, + __Widget_HorizontalAlignment__strToHAlign__C5_std_string_R1_S, "", ""); - I_StaticMethod1(osgWidget::Widget::COORDINATE_MODE, strToCoordMode, IN, const std::string &, x, - __Widget_COORDINATE_MODE__strToCoordMode__C5_std_string_R1_S, + I_StaticMethod1(osgWidget::Widget::CoordinateMode, strToCoordMode, IN, const std::string &, x, + __Widget_CoordinateMode__strToCoordMode__C5_std_string_R1_S, "", ""); I_StaticMethod1(bool, strToFill, IN, const std::string &, x, diff --git a/src/osgWrappers/osgWidget/Widget.cpp b/src/osgWrappers/osgWidget/Widget.cpp index f9624838c..f46f8a753 100644 --- a/src/osgWrappers/osgWidget/Widget.cpp +++ b/src/osgWrappers/osgWidget/Widget.cpp @@ -212,7 +212,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::NullWidget) ""); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Widget::POINT) +BEGIN_ENUM_REFLECTOR(osgWidget::Widget::Corner) I_DeclaringFile("osgWidget/Widget"); I_EnumLabel(osgWidget::Widget::LOWER_LEFT); I_EnumLabel(osgWidget::Widget::LOWER_RIGHT); @@ -222,10 +222,10 @@ BEGIN_ENUM_REFLECTOR(osgWidget::Widget::POINT) I_EnumLabel(osgWidget::Widget::LR); I_EnumLabel(osgWidget::Widget::UR); I_EnumLabel(osgWidget::Widget::UL); - I_EnumLabel(osgWidget::Widget::ALL_POINTS); + I_EnumLabel(osgWidget::Widget::ALL_CORNERS); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Widget::LAYER) +BEGIN_ENUM_REFLECTOR(osgWidget::Widget::Layer) I_DeclaringFile("osgWidget/Widget"); I_EnumLabel(osgWidget::Widget::LAYER_TOP); I_EnumLabel(osgWidget::Widget::LAYER_HIGH); @@ -234,21 +234,21 @@ BEGIN_ENUM_REFLECTOR(osgWidget::Widget::LAYER) I_EnumLabel(osgWidget::Widget::LAYER_BG); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Widget::VERTICAL_ALIGNMENT) +BEGIN_ENUM_REFLECTOR(osgWidget::Widget::VerticalAlignment) I_DeclaringFile("osgWidget/Widget"); I_EnumLabel(osgWidget::Widget::VA_CENTER); I_EnumLabel(osgWidget::Widget::VA_TOP); I_EnumLabel(osgWidget::Widget::VA_BOTTOM); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Widget::HORIZONTAL_ALIGNMENT) +BEGIN_ENUM_REFLECTOR(osgWidget::Widget::HorizontalAlignment) I_DeclaringFile("osgWidget/Widget"); I_EnumLabel(osgWidget::Widget::HA_CENTER); I_EnumLabel(osgWidget::Widget::HA_LEFT); I_EnumLabel(osgWidget::Widget::HA_RIGHT); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Widget::COORDINATE_MODE) +BEGIN_ENUM_REFLECTOR(osgWidget::Widget::CoordinateMode) I_DeclaringFile("osgWidget/Widget"); I_EnumLabel(osgWidget::Widget::CM_ABSOLUTE); I_EnumLabel(osgWidget::Widget::CM_RELATIVE); @@ -332,19 +332,19 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __void__setPadding__point_type, "", ""); - I_MethodWithDefaults5(void, setColor, IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::Widget::POINT, x, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults5(void, setColor, IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::Widget::Corner, x, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __void__setColor__color_type__color_type__color_type__color_type__POINT, + __void__setColor__color_type__color_type__color_type__color_type__Corner, "", ""); - I_MethodWithDefaults5(void, addColor, IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::Widget::POINT, x, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults5(void, addColor, IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::color_type, x, , IN, osgWidget::Widget::Corner, x, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __void__addColor__color_type__color_type__color_type__color_type__POINT, + __void__addColor__color_type__color_type__color_type__color_type__Corner, "", ""); - I_MethodWithDefaults3(void, setTexCoord, IN, osgWidget::texcoord_type, x, , IN, osgWidget::texcoord_type, x, , IN, osgWidget::Widget::POINT, x, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults3(void, setTexCoord, IN, osgWidget::texcoord_type, x, , IN, osgWidget::texcoord_type, x, , IN, osgWidget::Widget::Corner, x, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __void__setTexCoord__texcoord_type__texcoord_type__POINT, + __void__setTexCoord__texcoord_type__texcoord_type__Corner, "", ""); I_Method4(void, setTexCoordRegion, IN, osgWidget::point_type, x, IN, osgWidget::point_type, x, IN, osgWidget::point_type, x, IN, osgWidget::point_type, x, @@ -437,24 +437,24 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __point_type__getPadVertical, "", ""); - I_MethodWithDefaults1(const osgWidget::Point &, getPoint, IN, osgWidget::Widget::POINT, x, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults1(const osgWidget::Point &, getPoint, IN, osgWidget::Widget::Corner, x, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __C5_Point_R1__getPoint__POINT, + __C5_Point_R1__getPoint__Corner, "", ""); - I_MethodWithDefaults1(const osgWidget::Color &, getColor, IN, osgWidget::Widget::POINT, x, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults1(const osgWidget::Color &, getColor, IN, osgWidget::Widget::Corner, x, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __C5_Color_R1__getColor__POINT, + __C5_Color_R1__getColor__Corner, "", ""); - I_MethodWithDefaults1(const osgWidget::TexCoord &, getTexCoord, IN, osgWidget::Widget::POINT, x, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults1(const osgWidget::TexCoord &, getTexCoord, IN, osgWidget::Widget::Corner, x, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __C5_TexCoord_R1__getTexCoord__POINT, + __C5_TexCoord_R1__getTexCoord__Corner, "", ""); - I_Method1(osgWidget::Widget::POINT, convertPoint, IN, osgWidget::Widget::POINT, x, + I_Method1(osgWidget::Widget::Corner, convertCorner, IN, osgWidget::Widget::Corner, x, Properties::NON_VIRTUAL, - __POINT__convertPoint__POINT, + __Corner__convertCorner__Corner, "", ""); I_Method2(osgWidget::Color, getImageColorAtXY, IN, osgWidget::point_type, x, IN, osgWidget::point_type, y, @@ -532,14 +532,14 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __void__setSize__C5_XYCoord_R1, "", ""); - I_MethodWithDefaults2(void, setColor, IN, const osgWidget::Color &, col, , IN, osgWidget::Widget::POINT, p, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults2(void, setColor, IN, const osgWidget::Color &, col, , IN, osgWidget::Widget::Corner, p, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __void__setColor__C5_Color_R1__POINT, + __void__setColor__C5_Color_R1__Corner, "", ""); - I_MethodWithDefaults2(void, setTexCoord, IN, const osgWidget::XYCoord &, xy, , IN, osgWidget::Widget::POINT, p, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults2(void, setTexCoord, IN, const osgWidget::XYCoord &, xy, , IN, osgWidget::Widget::Corner, p, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __void__setTexCoord__C5_XYCoord_R1__POINT, + __void__setTexCoord__C5_XYCoord_R1__Corner, "", ""); I_Method3(void, setTexCoordRegion, IN, const osgWidget::XYCoord &, xy, IN, osgWidget::point_type, w, IN, osgWidget::point_type, h, @@ -547,9 +547,9 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __void__setTexCoordRegion__C5_XYCoord_R1__point_type__point_type, "", ""); - I_MethodWithDefaults2(void, addColor, IN, const osgWidget::Color &, col, , IN, osgWidget::Widget::POINT, p, osgWidget::Widget::ALL_POINTS, + I_MethodWithDefaults2(void, addColor, IN, const osgWidget::Color &, col, , IN, osgWidget::Widget::Corner, p, osgWidget::Widget::ALL_CORNERS, Properties::NON_VIRTUAL, - __void__addColor__C5_Color_R1__POINT, + __void__addColor__C5_Color_R1__Corner, "", ""); I_Method1(void, addOrigin, IN, const osgWidget::XYCoord &, xy, @@ -572,9 +572,9 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __void__setMinimumSize__C5_XYCoord_R1, "", ""); - I_MethodWithDefaults2(void, setLayer, IN, osgWidget::Widget::LAYER, l, , IN, unsigned int, offset, 0, + I_MethodWithDefaults2(void, setLayer, IN, osgWidget::Widget::Layer, l, , IN, unsigned int, offset, 0, Properties::NON_VIRTUAL, - __void__setLayer__LAYER__unsigned_int, + __void__setLayer__Layer__unsigned_int, "", ""); I_Method1(void, setPadLeft, IN, osgWidget::point_type, p, @@ -597,19 +597,19 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __void__setPadBottom__point_type, "", ""); - I_Method1(void, setAlignHorizontal, IN, osgWidget::Widget::HORIZONTAL_ALIGNMENT, h, + I_Method1(void, setAlignHorizontal, IN, osgWidget::Widget::HorizontalAlignment, h, Properties::NON_VIRTUAL, - __void__setAlignHorizontal__HORIZONTAL_ALIGNMENT, + __void__setAlignHorizontal__HorizontalAlignment, "", ""); - I_Method1(void, setAlignVertical, IN, osgWidget::Widget::VERTICAL_ALIGNMENT, v, + I_Method1(void, setAlignVertical, IN, osgWidget::Widget::VerticalAlignment, v, Properties::NON_VIRTUAL, - __void__setAlignVertical__VERTICAL_ALIGNMENT, + __void__setAlignVertical__VerticalAlignment, "", ""); - I_Method1(void, setCoordinateMode, IN, osgWidget::Widget::COORDINATE_MODE, cm, + I_Method1(void, setCoordinateMode, IN, osgWidget::Widget::CoordinateMode, cm, Properties::NON_VIRTUAL, - __void__setCoordinateMode__COORDINATE_MODE, + __void__setCoordinateMode__CoordinateMode, "", ""); I_Method1(void, setCanFill, IN, bool, f, @@ -697,19 +697,19 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __point_type__getPadBottom, "", ""); - I_Method0(osgWidget::Widget::HORIZONTAL_ALIGNMENT, getAlignHorizontal, + I_Method0(osgWidget::Widget::HorizontalAlignment, getAlignHorizontal, Properties::NON_VIRTUAL, - __HORIZONTAL_ALIGNMENT__getAlignHorizontal, + __HorizontalAlignment__getAlignHorizontal, "", ""); - I_Method0(osgWidget::Widget::VERTICAL_ALIGNMENT, getAlignVertical, + I_Method0(osgWidget::Widget::VerticalAlignment, getAlignVertical, Properties::NON_VIRTUAL, - __VERTICAL_ALIGNMENT__getAlignVertical, + __VerticalAlignment__getAlignVertical, "", ""); - I_Method0(osgWidget::Widget::COORDINATE_MODE, getCoordinateMode, + I_Method0(osgWidget::Widget::CoordinateMode, getCoordinateMode, Properties::NON_VIRTUAL, - __COORDINATE_MODE__getCoordinateMode, + __CoordinateMode__getCoordinateMode, "", ""); I_Method0(bool, canFill, @@ -840,21 +840,21 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __osg_Image_P1___getImage, "", ""); - I_SimpleProperty(osgWidget::Widget::HORIZONTAL_ALIGNMENT, AlignHorizontal, - __HORIZONTAL_ALIGNMENT__getAlignHorizontal, - __void__setAlignHorizontal__HORIZONTAL_ALIGNMENT); - I_SimpleProperty(osgWidget::Widget::VERTICAL_ALIGNMENT, AlignVertical, - __VERTICAL_ALIGNMENT__getAlignVertical, - __void__setAlignVertical__VERTICAL_ALIGNMENT); + I_SimpleProperty(osgWidget::Widget::HorizontalAlignment, AlignHorizontal, + __HorizontalAlignment__getAlignHorizontal, + __void__setAlignHorizontal__HorizontalAlignment); + I_SimpleProperty(osgWidget::Widget::VerticalAlignment, AlignVertical, + __VerticalAlignment__getAlignVertical, + __void__setAlignVertical__VerticalAlignment); I_SimpleProperty(bool, CanClone, 0, __void__setCanClone__bool); I_SimpleProperty(bool, CanFill, 0, __void__setCanFill__bool); - I_SimpleProperty(osgWidget::Widget::COORDINATE_MODE, CoordinateMode, - __COORDINATE_MODE__getCoordinateMode, - __void__setCoordinateMode__COORDINATE_MODE); + I_SimpleProperty(osgWidget::Widget::CoordinateMode, CoordinateMode, + __CoordinateMode__getCoordinateMode, + __void__setCoordinateMode__CoordinateMode); I_SimpleProperty(osgWidget::Quad, Dimensions, __Quad__getDimensions, 0); diff --git a/src/osgWrappers/osgWidget/Window.cpp b/src/osgWrappers/osgWidget/Window.cpp index deb82af30..16ee72b4a 100644 --- a/src/osgWrappers/osgWidget/Window.cpp +++ b/src/osgWrappers/osgWidget/Window.cpp @@ -29,21 +29,21 @@ TYPE_NAME_ALIAS(std::list< osg::observer_ptr< osgWidget::Window > >, osgWidget::Window::WindowList) -BEGIN_ENUM_REFLECTOR(osgWidget::Window::STRATA) +BEGIN_ENUM_REFLECTOR(osgWidget::Window::Strata) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::STRATA_NONE); I_EnumLabel(osgWidget::Window::STRATA_BACKGROUND); I_EnumLabel(osgWidget::Window::STRATA_FOREGROUND); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Window::VISIBILITY_MODE) +BEGIN_ENUM_REFLECTOR(osgWidget::Window::VisibilityMode) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::VM_FULL); I_EnumLabel(osgWidget::Window::VM_PARTIAL); I_EnumLabel(osgWidget::Window::VM_ENTIRE); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Window::VERTICAL_ANCHOR) +BEGIN_ENUM_REFLECTOR(osgWidget::Window::VerticalAnchor) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::VA_NONE); I_EnumLabel(osgWidget::Window::VA_CENTER); @@ -51,7 +51,7 @@ BEGIN_ENUM_REFLECTOR(osgWidget::Window::VERTICAL_ANCHOR) I_EnumLabel(osgWidget::Window::VA_BOTTOM); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::Window::HORIZONTAL_ANCHOR) +BEGIN_ENUM_REFLECTOR(osgWidget::Window::HorizontalAnchor) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::HA_NONE); I_EnumLabel(osgWidget::Window::HA_CENTER); @@ -319,14 +319,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) __point_type__getMinHeight, "", ""); - I_Method0(osgWidget::Window::VERTICAL_ANCHOR, getAnchorVertical, + I_Method0(osgWidget::Window::VerticalAnchor, getAnchorVertical, Properties::NON_VIRTUAL, - __VERTICAL_ANCHOR__getAnchorVertical, + __VerticalAnchor__getAnchorVertical, "", ""); - I_Method0(osgWidget::Window::HORIZONTAL_ANCHOR, getAnchorHorizontal, + I_Method0(osgWidget::Window::HorizontalAnchor, getAnchorHorizontal, Properties::NON_VIRTUAL, - __HORIZONTAL_ANCHOR__getAnchorHorizontal, + __HorizontalAnchor__getAnchorHorizontal, "", ""); I_Method0(osgWidget::XYCoord, getOrigin, @@ -349,9 +349,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) __matrix_type__getZRange, "", ""); - I_Method0(osgWidget::Window::STRATA, getStrata, + I_Method0(osgWidget::Window::Strata, getStrata, Properties::NON_VIRTUAL, - __STRATA__getStrata, + __Strata__getStrata, "", ""); I_Method0(const osgWidget::Quad &, getVisibleArea, @@ -359,9 +359,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) __C5_Quad_R1__getVisibleArea, "", ""); - I_Method0(osgWidget::Window::VISIBILITY_MODE, getVisibilityMode, + I_Method0(osgWidget::Window::VisibilityMode, getVisibilityMode, Properties::NON_VIRTUAL, - __VISIBILITY_MODE__getVisibilityMode, + __VisibilityMode__getVisibilityMode, "", ""); I_Method0(osgWidget::Point, getPosition, @@ -424,24 +424,24 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) __void__setScaleDenominator__matrix_type, "", ""); - I_Method1(void, setAnchorVertical, IN, osgWidget::Window::VERTICAL_ANCHOR, va, + I_Method1(void, setAnchorVertical, IN, osgWidget::Window::VerticalAnchor, va, Properties::NON_VIRTUAL, - __void__setAnchorVertical__VERTICAL_ANCHOR, + __void__setAnchorVertical__VerticalAnchor, "", ""); - I_Method1(void, setAnchorHorizontal, IN, osgWidget::Window::HORIZONTAL_ANCHOR, ha, + I_Method1(void, setAnchorHorizontal, IN, osgWidget::Window::HorizontalAnchor, ha, Properties::NON_VIRTUAL, - __void__setAnchorHorizontal__HORIZONTAL_ANCHOR, + __void__setAnchorHorizontal__HorizontalAnchor, "", ""); - I_Method1(void, setStrata, IN, osgWidget::Window::STRATA, s, + I_Method1(void, setStrata, IN, osgWidget::Window::Strata, s, Properties::NON_VIRTUAL, - __void__setStrata__STRATA, + __void__setStrata__Strata, "", ""); - I_Method1(void, setVisibilityMode, IN, osgWidget::Window::VISIBILITY_MODE, v, + I_Method1(void, setVisibilityMode, IN, osgWidget::Window::VisibilityMode, v, Properties::NON_VIRTUAL, - __void__setVisibilityMode__VISIBILITY_MODE, + __void__setVisibilityMode__VisibilityMode, "", ""); I_Method1(void, addX, IN, osgWidget::matrix_type, x, @@ -749,12 +749,12 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) I_SimpleProperty(osgWidget::XYCoord, AbsoluteOrigin, __XYCoord__getAbsoluteOrigin, 0); - I_SimpleProperty(osgWidget::Window::HORIZONTAL_ANCHOR, AnchorHorizontal, - __HORIZONTAL_ANCHOR__getAnchorHorizontal, - __void__setAnchorHorizontal__HORIZONTAL_ANCHOR); - I_SimpleProperty(osgWidget::Window::VERTICAL_ANCHOR, AnchorVertical, - __VERTICAL_ANCHOR__getAnchorVertical, - __void__setAnchorVertical__VERTICAL_ANCHOR); + I_SimpleProperty(osgWidget::Window::HorizontalAnchor, AnchorHorizontal, + __HorizontalAnchor__getAnchorHorizontal, + __void__setAnchorHorizontal__HorizontalAnchor); + I_SimpleProperty(osgWidget::Window::VerticalAnchor, AnchorVertical, + __VerticalAnchor__getAnchorVertical, + __void__setAnchorVertical__VerticalAnchor); I_SimpleProperty(osgWidget::Widget *, Background, __Widget_P1__getBackground, 0); @@ -800,15 +800,15 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) I_SimpleProperty(osgWidget::XYCoord, Size, __XYCoord__getSize, 0); - I_SimpleProperty(osgWidget::Window::STRATA, Strata, - __STRATA__getStrata, - __void__setStrata__STRATA); + I_SimpleProperty(osgWidget::Window::Strata, Strata, + __Strata__getStrata, + __void__setStrata__Strata); I_SimpleProperty(osgWidget::Window *, TopmostParent, __Window_P1__getTopmostParent, 0); - I_SimpleProperty(osgWidget::Window::VISIBILITY_MODE, VisibilityMode, - __VISIBILITY_MODE__getVisibilityMode, - __void__setVisibilityMode__VISIBILITY_MODE); + I_SimpleProperty(osgWidget::Window::VisibilityMode, VisibilityMode, + __VisibilityMode__getVisibilityMode, + __void__setVisibilityMode__VisibilityMode); I_SimpleProperty(const osgWidget::Quad &, VisibleArea, __C5_Quad_R1__getVisibleArea, 0); diff --git a/src/osgWrappers/osgWidget/WindowManager.cpp b/src/osgWrappers/osgWidget/WindowManager.cpp index 7298866da..9397e15e0 100644 --- a/src/osgWrappers/osgWidget/WindowManager.cpp +++ b/src/osgWrappers/osgWidget/WindowManager.cpp @@ -31,7 +31,7 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::WM_FLAGS) +BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::WmFlags) I_DeclaringFile("osgWidget/WindowManager"); I_EnumLabel(osgWidget::WindowManager::WM_USE_LUA); I_EnumLabel(osgWidget::WindowManager::WM_USE_PYTHON); @@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::WM_FLAGS) I_EnumLabel(osgWidget::WindowManager::WM_NO_BETA_WARN); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::POINTER_DIRECTION) +BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::PointerDirection) I_DeclaringFile("osgWidget/WindowManager"); I_EnumLabel(osgWidget::WindowManager::PD_NONE); I_EnumLabel(osgWidget::WindowManager::PD_LEFT); @@ -49,7 +49,7 @@ BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::POINTER_DIRECTION) I_EnumLabel(osgWidget::WindowManager::PD_DOWN); END_REFLECTOR -BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::POINTER_FOCUS_MODE) +BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::PointerFocusMode) I_DeclaringFile("osgWidget/WindowManager"); I_EnumLabel(osgWidget::WindowManager::PFM_FOCUS); I_EnumLabel(osgWidget::WindowManager::PFM_UNFOCUS); @@ -203,19 +203,19 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::WindowManager) __C5_StyleManager_P1__getStyleManager, "", ""); - I_Method0(osgWidget::WindowManager::POINTER_DIRECTION, getPointerVerticalDirection, + I_Method0(osgWidget::WindowManager::PointerDirection, getPointerVerticalDirection, Properties::NON_VIRTUAL, - __POINTER_DIRECTION__getPointerVerticalDirection, + __PointerDirection__getPointerVerticalDirection, "", ""); - I_Method0(osgWidget::WindowManager::POINTER_DIRECTION, getPointerHorizontalDirection, + I_Method0(osgWidget::WindowManager::PointerDirection, getPointerHorizontalDirection, Properties::NON_VIRTUAL, - __POINTER_DIRECTION__getPointerHorizontalDirection, + __PointerDirection__getPointerHorizontalDirection, "", ""); - I_Method0(osgWidget::WindowManager::POINTER_FOCUS_MODE, getPointerFocusMode, + I_Method0(osgWidget::WindowManager::PointerFocusMode, getPointerFocusMode, Properties::NON_VIRTUAL, - __POINTER_FOCUS_MODE__getPointerFocusMode, + __PointerFocusMode__getPointerFocusMode, "", ""); I_Method0(int, getPointerDirectionVector, @@ -288,9 +288,9 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::WindowManager) __void__setScrollingMotion__osgGA_GUIEventAdapter_ScrollingMotion, "", ""); - I_Method1(void, setPointerFocusMode, IN, osgWidget::WindowManager::POINTER_FOCUS_MODE, pfm, + I_Method1(void, setPointerFocusMode, IN, osgWidget::WindowManager::PointerFocusMode, pfm, Properties::NON_VIRTUAL, - __void__setPointerFocusMode__POINTER_FOCUS_MODE, + __void__setPointerFocusMode__PointerFocusMode, "", ""); I_Method1(void, setWidth, IN, osgWidget::point_type, w, @@ -373,14 +373,14 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::WindowManager) I_SimpleProperty(int, PointerDirectionVector, __int__getPointerDirectionVector, 0); - I_SimpleProperty(osgWidget::WindowManager::POINTER_FOCUS_MODE, PointerFocusMode, - __POINTER_FOCUS_MODE__getPointerFocusMode, - __void__setPointerFocusMode__POINTER_FOCUS_MODE); - I_SimpleProperty(osgWidget::WindowManager::POINTER_DIRECTION, PointerHorizontalDirection, - __POINTER_DIRECTION__getPointerHorizontalDirection, + I_SimpleProperty(osgWidget::WindowManager::PointerFocusMode, PointerFocusMode, + __PointerFocusMode__getPointerFocusMode, + __void__setPointerFocusMode__PointerFocusMode); + I_SimpleProperty(osgWidget::WindowManager::PointerDirection, PointerHorizontalDirection, + __PointerDirection__getPointerHorizontalDirection, 0); - I_SimpleProperty(osgWidget::WindowManager::POINTER_DIRECTION, PointerVerticalDirection, - __POINTER_DIRECTION__getPointerVerticalDirection, + I_SimpleProperty(osgWidget::WindowManager::PointerDirection, PointerVerticalDirection, + __PointerDirection__getPointerVerticalDirection, 0); I_SimpleProperty(osgWidget::ScriptEngine *, PythonEngine, __ScriptEngine_P1__getPythonEngine,