diff options
| author | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:11 +0300 |
|---|---|---|
| committer | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:47 +0300 |
| commit | d97d1708d68a98c039db8a06c4110bfc961d3fb1 (patch) | |
| tree | 1a90cd7a34793982aa9376468feb41e67d2b7cdc /include/IGUIStaticText.h | |
| parent | ba77d01c91a363ad932ecd26c3eaba82ddf7a6f0 (diff) | |
| parent | 799c8b936f9a2cc4f3a8bc56237fb9a8dedf853e (diff) | |
| download | irrlicht-d97d1708d68a98c039db8a06c4110bfc961d3fb1.tar.xz | |
Resolve conflicts with master
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 33db281..5d4f9ec 100644 --- a/include/IGUIStaticText.h +++ b/include/IGUIStaticText.h @@ -88,9 +88,9 @@ 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.
+ EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
\param vertical: EGUIA_UPPERLEFT to align with top edge (default),
- EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
+ EGUIA_LOWERRIGHT 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.
|