1 files changed, 14 insertions, 16 deletions

diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 5de9463..8c317ee 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -53,6 +54,12 @@ class LLComboBox
 :       public LLUICtrl, public LLCtrlListInterface
 {
 public:
+        typedef enum e_preferred_position
+        {
+                ABOVE,
+                BELOW
+        } EPreferredPosition;
+
         LLComboBox(
                 const LLString& name, 
                 const LLRect &rect,
@@ -77,12 +84,6 @@ public:
         virtual BOOL    handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
         virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
         virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
-        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
 
         // LLUICtrl interface
         virtual void    clear();                                        // select nothing
@@ -165,34 +166,31 @@ public:
 
         void                    setButtonVisible(BOOL visible);
 
-        static void             onButtonClick(void *userdata);
+        static void             onButtonDown(void *userdata);
         static void             onItemSelected(LLUICtrl* item, void *userdata);
-        static void             onTopViewLost(LLView* old_focus);
-        static void             onMouseCaptureLost(LLMouseHandler* old_captor);
+        static void             onListFocusChanged(LLUICtrl* item, void *userdata);
         static void             onTextEntry(LLLineEditor* line_editor, void* user_data);
         static void             onTextCommit(LLUICtrl* caller, void* user_data);
 
         void                    updateSelection();
-        void                    showList();
-        void                    hideList();
-
-        static void             onListFocusLost(LLUICtrl* old_focus);
-
+        virtual void    showList();
+        virtual void    hideList();
+        
 protected:
         LLButton*                       mButton;
         LLScrollListCtrl*       mList;
         LLViewBorder*           mBorder;
         BOOL                            mKeyboardFocusOnClick;
-        BOOL                            mDrawButton;
+        BOOL                            mDrawArrow;
         LLLineEditor*           mTextEntry;
         LLPointer<LLImageGL>    mArrowImage;
         S32                                     mArrowImageWidth;
         BOOL                            mAllowTextEntry;
         S32                                     mMaxChars;
         BOOL                            mTextEntryTentative;
+        EPreferredPosition      mListPosition;
         void                            (*mPrearrangeCallback)(LLUICtrl*,void*);
         void                            (*mTextEntryCallback)(LLLineEditor*, void*);
-        S32 mListWidth; // width of pop-up list, 0 = use combobox width
 };
 
 #endif