mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Complete bug 112241 backout

This commit is contained in:
jkeiser%netscape.com 2002-01-25 20:51:41 +00:00
Родитель 97e08a35b7
Коммит 2af0669711
2 изменённых файлов: 38 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

43
layout/forms/nsListControlFrame.h
Просмотреть файл

@ -274,6 +274,7 @@ public:
NS_IMETHOD AboutToDropDown(); NS_IMETHOD AboutToDropDown();
NS_IMETHOD AboutToRollup(); NS_IMETHOD AboutToRollup();
NS_IMETHOD UpdateSelection(); NS_IMETHOD UpdateSelection();
NS_IMETHOD ComboboxUpdateSelection(PRBool aForceUpdate, PRBool aSendEvent);
NS_IMETHOD SetOverrideReflowOptimization(PRBool aValue) { mOverrideReflowOpt = aValue; return NS_OK; } NS_IMETHOD SetOverrideReflowOptimization(PRBool aValue) { mOverrideReflowOpt = aValue; return NS_OK; }
NS_IMETHOD GetOptionsContainer(nsIPresContext* aPresContext, nsIFrame** aFrame); NS_IMETHOD GetOptionsContainer(nsIPresContext* aPresContext, nsIFrame** aFrame);
@ -285,7 +286,6 @@ public:
NS_IMETHOD OnOptionSelected(nsIPresContext* aPresContext, NS_IMETHOD OnOptionSelected(nsIPresContext* aPresContext,
PRInt32 aIndex, PRInt32 aIndex,
PRBool aSelected); PRBool aSelected);
NS_IMETHOD OnOptionTextChanged(nsIDOMHTMLOptionElement* option);
NS_IMETHOD GetDummyFrame(nsIFrame** aFrame); NS_IMETHOD GetDummyFrame(nsIFrame** aFrame);
NS_IMETHOD SetDummyFrame(nsIFrame* aFrame); NS_IMETHOD SetDummyFrame(nsIFrame* aFrame);
@ -352,46 +352,41 @@ protected:
PRBool IsContentSelected(nsIContent* aContent); PRBool IsContentSelected(nsIContent* aContent);
PRBool IsContentSelectedByIndex(PRInt32 aIndex); PRBool IsContentSelectedByIndex(PRInt32 aIndex);
void GetViewOffset(nsIViewManager* aManager, nsIView* aView, nsPoint& aPoint); void GetViewOffset(nsIViewManager* aManager, nsIView* aView, nsPoint& aPoint);
PRBool IsOptionElement(nsIContent* aContent);
PRBool CheckIfAllFramesHere();
PRInt32 GetIndexFromContent(nsIContent *aContent);
PRBool IsLeftButton(nsIDOMEvent* aMouseEvent);
void GetScrollableView(nsIScrollableView*& aScrollableView);
// Dropped down stuff
void SetComboboxItem(PRInt32 aIndex);
void ComboboxFinish(PRInt32 aIndex);
PRBool IsInDropDownMode(); PRBool IsInDropDownMode();
PRBool IsOptionElement(nsIContent* aContent);
// Selection void SingleSelection(PRInt32 aSelectedIndex, PRBool aDoToggle);
PRBool SetOptionsSelectedFromFrame(PRInt32 aStartIndex, void ExtendedSelection(PRInt32 aStartIndex,
PRInt32 aEndIndex,
PRBool aValue,
PRBool aClearAll);
PRBool ToggleOptionSelectedFromFrame(PRInt32 aIndex);
PRBool SingleSelection(PRInt32 aSelectedIndex, PRBool aDoToggle);
PRBool ExtendedSelection(PRInt32 aStartIndex,
PRInt32 aEndIndex, PRInt32 aEndIndex,
PRBool aClearAll); PRBool aClearAll);
PRBool PerformSelection(PRInt32 aSelectedIndex, void PerformSelection(PRInt32 aSelectedIndex,
PRBool aIsShift, PRBool aIsShift,
PRBool aIsControl); PRBool aIsControl);
PRBool HandleListSelection(nsIDOMEvent * aDOMEvent, PRInt32 selectedIndex); void ResetSelectedItem();
PRBool CheckIfAllFramesHere();
PRInt32 GetIndexFromContent(nsIContent *aContent);
void HandleListSelection(nsIDOMEvent * aDOMEvent, PRInt32 selectedIndex);
PRBool IsLeftButton(nsIDOMEvent* aMouseEvent);
nsresult SetOptionsSelectedFromFrame(PRInt32 aStartIndex,
PRInt32 aEndIndex,
PRBool aValue,
PRBool aClearAll);
nsresult ToggleOptionSelectedFromFrame(PRInt32 aIndex);
void GetScrollableView(nsIScrollableView*& aScrollableView);
// Timer Methods // Timer Methods
nsresult StartUpdateTimer(nsIPresContext * aPresContext); nsresult StartUpdateTimer(nsIPresContext * aPresContext);
void StopUpdateTimer(); void StopUpdateTimer();
void ItemsHaveBeenRemoved(nsIPresContext * aPresContext); void ItemsHaveBeenRemoved(nsIPresContext * aPresContext);
// fire onChange // onChange detection
nsresult FireOnChange(); nsresult SelectionChanged();
// Data Members // Data Members
nsFormFrame* mFormFrame; nsFormFrame* mFormFrame;
PRInt32 mStartSelectionIndex; PRInt32 mStartSelectionIndex;
PRInt32 mEndSelectionIndex; PRInt32 mEndSelectionIndex;
PRPackedBool mChangesSinceDragStart; PRBool mChangesNotNotified;
PRInt32 mSelectedIndexWhenPoppedDown; PRInt32 mSelectedIndexWhenPoppedDown;
nsIComboboxControlFrame *mComboboxFrame; nsIComboboxControlFrame *mComboboxFrame;

43
layout/html/forms/src/nsListControlFrame.h
Просмотреть файл

@ -274,6 +274,7 @@ public:
NS_IMETHOD AboutToDropDown(); NS_IMETHOD AboutToDropDown();
NS_IMETHOD AboutToRollup(); NS_IMETHOD AboutToRollup();
NS_IMETHOD UpdateSelection(); NS_IMETHOD UpdateSelection();
NS_IMETHOD ComboboxUpdateSelection(PRBool aForceUpdate, PRBool aSendEvent);
NS_IMETHOD SetOverrideReflowOptimization(PRBool aValue) { mOverrideReflowOpt = aValue; return NS_OK; } NS_IMETHOD SetOverrideReflowOptimization(PRBool aValue) { mOverrideReflowOpt = aValue; return NS_OK; }
NS_IMETHOD GetOptionsContainer(nsIPresContext* aPresContext, nsIFrame** aFrame); NS_IMETHOD GetOptionsContainer(nsIPresContext* aPresContext, nsIFrame** aFrame);
@ -285,7 +286,6 @@ public:
NS_IMETHOD OnOptionSelected(nsIPresContext* aPresContext, NS_IMETHOD OnOptionSelected(nsIPresContext* aPresContext,
PRInt32 aIndex, PRInt32 aIndex,
PRBool aSelected); PRBool aSelected);
NS_IMETHOD OnOptionTextChanged(nsIDOMHTMLOptionElement* option);
NS_IMETHOD GetDummyFrame(nsIFrame** aFrame); NS_IMETHOD GetDummyFrame(nsIFrame** aFrame);
NS_IMETHOD SetDummyFrame(nsIFrame* aFrame); NS_IMETHOD SetDummyFrame(nsIFrame* aFrame);
@ -352,46 +352,41 @@ protected:
PRBool IsContentSelected(nsIContent* aContent); PRBool IsContentSelected(nsIContent* aContent);
PRBool IsContentSelectedByIndex(PRInt32 aIndex); PRBool IsContentSelectedByIndex(PRInt32 aIndex);
void GetViewOffset(nsIViewManager* aManager, nsIView* aView, nsPoint& aPoint); void GetViewOffset(nsIViewManager* aManager, nsIView* aView, nsPoint& aPoint);
PRBool IsOptionElement(nsIContent* aContent);
PRBool CheckIfAllFramesHere();
PRInt32 GetIndexFromContent(nsIContent *aContent);
PRBool IsLeftButton(nsIDOMEvent* aMouseEvent);
void GetScrollableView(nsIScrollableView*& aScrollableView);
// Dropped down stuff
void SetComboboxItem(PRInt32 aIndex);
void ComboboxFinish(PRInt32 aIndex);
PRBool IsInDropDownMode(); PRBool IsInDropDownMode();
PRBool IsOptionElement(nsIContent* aContent);
// Selection void SingleSelection(PRInt32 aSelectedIndex, PRBool aDoToggle);
PRBool SetOptionsSelectedFromFrame(PRInt32 aStartIndex, void ExtendedSelection(PRInt32 aStartIndex,
PRInt32 aEndIndex,
PRBool aValue,
PRBool aClearAll);
PRBool ToggleOptionSelectedFromFrame(PRInt32 aIndex);
PRBool SingleSelection(PRInt32 aSelectedIndex, PRBool aDoToggle);
PRBool ExtendedSelection(PRInt32 aStartIndex,
PRInt32 aEndIndex, PRInt32 aEndIndex,
PRBool aClearAll); PRBool aClearAll);
PRBool PerformSelection(PRInt32 aSelectedIndex, void PerformSelection(PRInt32 aSelectedIndex,
PRBool aIsShift, PRBool aIsShift,
PRBool aIsControl); PRBool aIsControl);
PRBool HandleListSelection(nsIDOMEvent * aDOMEvent, PRInt32 selectedIndex); void ResetSelectedItem();
PRBool CheckIfAllFramesHere();
PRInt32 GetIndexFromContent(nsIContent *aContent);
void HandleListSelection(nsIDOMEvent * aDOMEvent, PRInt32 selectedIndex);
PRBool IsLeftButton(nsIDOMEvent* aMouseEvent);
nsresult SetOptionsSelectedFromFrame(PRInt32 aStartIndex,
PRInt32 aEndIndex,
PRBool aValue,
PRBool aClearAll);
nsresult ToggleOptionSelectedFromFrame(PRInt32 aIndex);
void GetScrollableView(nsIScrollableView*& aScrollableView);
// Timer Methods // Timer Methods
nsresult StartUpdateTimer(nsIPresContext * aPresContext); nsresult StartUpdateTimer(nsIPresContext * aPresContext);
void StopUpdateTimer(); void StopUpdateTimer();
void ItemsHaveBeenRemoved(nsIPresContext * aPresContext); void ItemsHaveBeenRemoved(nsIPresContext * aPresContext);
// fire onChange // onChange detection
nsresult FireOnChange(); nsresult SelectionChanged();
// Data Members // Data Members
nsFormFrame* mFormFrame; nsFormFrame* mFormFrame;
PRInt32 mStartSelectionIndex; PRInt32 mStartSelectionIndex;
PRInt32 mEndSelectionIndex; PRInt32 mEndSelectionIndex;
PRPackedBool mChangesSinceDragStart; PRBool mChangesNotNotified;
PRInt32 mSelectedIndexWhenPoppedDown; PRInt32 mSelectedIndexWhenPoppedDown;
nsIComboboxControlFrame *mComboboxFrame; nsIComboboxControlFrame *mComboboxFrame;