diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-09-29 20:22:28 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-09-29 20:22:28 +0000 |
| commit | 8b9947f9f6e5444eb34f42eecfa5b4cfdeed25d8 (patch) | |
| tree | db04fac888fc72f19fa375a3529f361f36f00dbd /include/IGUIStaticText.h | |
| parent | 048aa500b9a999d801ad8b2f7e771b2d8d5b8aad (diff) | |
| download | irrlicht-8b9947f9f6e5444eb34f42eecfa5b4cfdeed25d8.tar.xz | |
Merging r6128 through r6139 from trunk to ogl-es branch.
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'include/IGUIStaticText.h')
| -rw-r--r-- | include/IGUIStaticText.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/IGUIStaticText.h b/include/IGUIStaticText.h index b55bd95..beb8f59 100644 --- a/include/IGUIStaticText.h +++ b/include/IGUIStaticText.h @@ -85,8 +85,8 @@ namespace gui //! Sets text justification mode
/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
- \param vertical: EGUIA_UPPERLEFT to align with top edge,
- EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+ \param vertical: EGUIA_UPPERLEFT to align with top edge (default),
+ EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
//! Enables or disables word wrap for using the static text as multiline text control.
|