diff options
| author | Richard Linden <none@none> | 2010-11-23 16:25:10 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-23 16:25:10 -0800 |
| commit | f8d08af9f1e810c977626e4131baf771d2b3655c (patch) | |
| tree | 16f7d2bf54d481e2f4372b43f5dff1d15b5458a4 /indra/llui/lllayoutstack.h | |
| parent | ab34a6328026e61db5758f246773e29d5bf6d506 (diff) | |
SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
converted LLLayoutStack orientation param to use named enums
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index e19ef403ef..9e8539c716 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -37,12 +37,24 @@ class LLLayoutPanel; class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack> { public: + typedef enum e_layout_orientation + { + HORIZONTAL, + VERTICAL + } ELayoutOrientation; + + struct OrientationNames + : public LLInitParam::TypeValuesHelper<ELayoutOrientation, OrientationNames> + { + static void declareValues(); + }; + struct LayoutStackRegistry : public LLChildRegistry<LayoutStackRegistry> {}; struct Params : public LLInitParam::Block<Params, LLView::Params> { - Mandatory<std::string> orientation; + Mandatory<ELayoutOrientation, OrientationNames> orientation; Optional<S32> border_size; Optional<bool> animate, clip; @@ -52,12 +64,6 @@ public: typedef LayoutStackRegistry child_registry_t; - typedef enum e_layout_orientation - { - HORIZONTAL, - VERTICAL - } ELayoutOrientation; - virtual ~LLLayoutStack(); /*virtual*/ void draw(); |
