- Timestamp:
- May 31, 2006, 11:09:27 AM (18 years ago)
- Location:
- branches/gui/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gui/src/lib/graphics/importer/model.h
r7193 r8016 25 25 #include "base_object.h" 26 26 #include "vector.h" 27 28 using namespace std;29 27 30 28 -
branches/gui/src/lib/gui/gl_gui/glgui_box.cc
r8004 r8016 50 50 51 51 this->children.push_back(widget); 52 this->addChild2D(widget);52 widget->setParentWidget(this); 53 53 54 54 this->resize(); -
branches/gui/src/lib/gui/gl_gui/glgui_widget.cc
r8008 r8016 34 34 this->init(); 35 35 36 if (parent != NULL) 37 parent->addChild2D(this); 36 this->setParentWidget(parent); 38 37 } 39 38 … … 72 71 } 73 72 73 74 void GLGuiWidget::setParentWidget(GLGuiWidget* parent) 75 { 76 this->_parent = parent; 77 78 if (parent != NULL) 79 parent->addChild2D(this); 80 } 74 81 75 82 /** @brief gives focus to this widget */ … … 115 122 { 116 123 this->backRect().setSize(this->getSize2D()); 124 if (this->parent() != NULL) 125 this->parent()->resize(); 117 126 } 118 127 -
branches/gui/src/lib/gui/gl_gui/glgui_widget.h
r8008 r8016 44 44 45 45 46 void setParentWidget(GLGuiWidget* parent); 47 GLGuiWidget* parent() const { return this->_parent; } 48 46 49 /// FOCUS 47 50 /** @brief gives focus to this widget */ … … 59 62 /** @returns the currently focused Widget (NULL if none is selected) */ 60 63 static GLGuiWidget* focused() { return GLGuiWidget::_focused; }; 61 62 64 63 65 … … 132 134 133 135 private: 136 GLGuiWidget* _parent; //!< The parent of this Widget. 137 134 138 /// LOOKS 135 139 Material _backMat; … … 147 151 bool _pushed; 148 152 153 149 154 static GLGuiWidget* _selected; //!< The currently selected Widget. 150 155 static GLGuiWidget* _focused; //!< The currently Focused Widget. -
branches/gui/src/lib/lang/base_object.h
r7779 r8016 12 12 #include "class_id.h" 13 13 #include "debug.h" 14 #ifndef NULL 15 #define NULL 0 //!< NULL 16 #endif 14 #include <string> 17 15 18 #include <string>19 16 #include "stdincl.h" 20 17 -
branches/gui/src/story_entities/simple_game_menu.cc
r8013 r8016 117 117 OrxGui::GLGuiBox* imageSelector = new OrxGui::GLGuiBox(); 118 118 { 119 120 119 image = new OrxGui::GLGuiImage(); 121 image->setWidgetSize( 200, 200);120 image->setWidgetSize(300, 300); 122 121 image->setAbsCoor2D(300, 300); 123 122 imageSelector->pack(image);
Note: See TracChangeset
for help on using the changeset viewer.