Changeset 10999 for code/branches/cpp11_v2/src/modules/overlays
- Timestamp:
- Dec 30, 2015, 2:31:14 PM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/modules/overlays
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc
r10774 r10999 42 42 RegisterClass(OverlayText); 43 43 44 static_assert((int)Ogre::TextAreaOverlayElement::Left == (int)OverlayText:: Left, "check enum");45 static_assert((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText:: Center, "check enum");46 static_assert((int)Ogre::TextAreaOverlayElement::Right == (int)OverlayText:: Right, "check enum");44 static_assert((int)Ogre::TextAreaOverlayElement::Left == (int)OverlayText::Alignment::Left, "check enum"); 45 static_assert((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Alignment::Center, "check enum"); 46 static_assert((int)Ogre::TextAreaOverlayElement::Right == (int)OverlayText::Alignment::Right, "check enum"); 47 47 48 48 OverlayText::OverlayText(Context* context) … … 85 85 { 86 86 if (alignment == "right") 87 this->setAlignment(OverlayText:: Right);87 this->setAlignment(OverlayText::Alignment::Right); 88 88 else if (alignment == "center") 89 this->setAlignment(OverlayText:: Center);89 this->setAlignment(OverlayText::Alignment::Center); 90 90 else // "left" and default 91 this->setAlignment(OverlayText:: Left);91 this->setAlignment(OverlayText::Alignment::Left); 92 92 } 93 93 -
code/branches/cpp11_v2/src/modules/overlays/OverlayText.h
r10817 r10999 42 42 { 43 43 public: 44 enum Alignment44 enum class Alignment 45 45 { 46 46 Left,
Note: See TracChangeset
for help on using the changeset viewer.