From 509a2f333f0f37cfdfd8ae1b3869c436cf3157db Mon Sep 17 00:00:00 2001 From: "kmcclusk%netscape.com" Date: Mon, 25 Jan 1999 22:16:27 +0000 Subject: [PATCH] Added SetProperty/GetProperty methods to nsIFormControlFrame. Added stub implementations for all classes that derive from nsIFormControlFrame git-svn-id: svn://10.0.0.236/trunk@18509 18797224-902f-48f8-a5cc-f745e15eee43 --- .../layout/forms/nsComboboxControlFrame.cpp | 11 +++++++++++ mozilla/layout/forms/nsComboboxControlFrame.h | 5 +++++ mozilla/layout/forms/nsFileControlFrame.cpp | 10 ++++++++++ mozilla/layout/forms/nsFileControlFrame.h | 4 ++++ mozilla/layout/forms/nsFormControlFrame.cpp | 11 +++++++++++ mozilla/layout/forms/nsFormControlFrame.h | 5 +++++ .../layout/forms/nsHTMLButtonControlFrame.cpp | 15 +++++++++++++++ mozilla/layout/forms/nsIFormControlFrame.h | 18 ++++++++++++++++++ mozilla/layout/forms/nsImageControlFrame.cpp | 13 +++++++++++++ mozilla/layout/forms/nsListControlFrame.cpp | 11 +++++++++++ mozilla/layout/forms/nsListControlFrame.h | 5 +++++ mozilla/layout/forms/nsTextControlFrame.cpp | 10 ++++++++++ mozilla/layout/forms/nsTextControlFrame.h | 4 ++++ .../html/forms/public/nsIFormControlFrame.h | 18 ++++++++++++++++++ .../html/forms/src/nsButtonControlFrame.cpp | 10 ++++++++++ .../html/forms/src/nsButtonControlFrame.h | 4 ++++ .../html/forms/src/nsCheckboxControlFrame.cpp | 13 +++++++++++++ .../html/forms/src/nsComboboxControlFrame.cpp | 11 +++++++++++ .../html/forms/src/nsComboboxControlFrame.h | 5 +++++ .../html/forms/src/nsFileControlFrame.cpp | 10 ++++++++++ .../layout/html/forms/src/nsFileControlFrame.h | 4 ++++ .../html/forms/src/nsFormControlFrame.cpp | 11 +++++++++++ .../layout/html/forms/src/nsFormControlFrame.h | 5 +++++ .../forms/src/nsHTMLButtonControlFrame.cpp | 15 +++++++++++++++ .../html/forms/src/nsImageControlFrame.cpp | 13 +++++++++++++ .../html/forms/src/nsListControlFrame.cpp | 11 +++++++++++ .../layout/html/forms/src/nsListControlFrame.h | 5 +++++ .../html/forms/src/nsRadioControlFrame.cpp | 11 +++++++++++ .../html/forms/src/nsRadioControlFrame.h | 5 +++++ .../html/forms/src/nsSelectControlFrame.cpp | 15 +++++++++++++++ .../html/forms/src/nsTextControlFrame.cpp | 10 ++++++++++ .../layout/html/forms/src/nsTextControlFrame.h | 4 ++++ 32 files changed, 302 insertions(+) diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index f44123cb093..14e385431d7 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -899,3 +899,14 @@ nsComboboxControlFrame::ListWasSelected(nsIPresContext* aPresContext) return NS_OK; } +NS_IMETHODIMP nsComboboxControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsComboboxControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + diff --git a/mozilla/layout/forms/nsComboboxControlFrame.h b/mozilla/layout/forms/nsComboboxControlFrame.h index 8b285a302ab..114cf251bf1 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.h +++ b/mozilla/layout/forms/nsComboboxControlFrame.h @@ -48,6 +48,7 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); // nsIFrame + NS_IMETHOD SetInitialChildList(nsIPresContext& aPresContext, nsIAtom* aListName, nsIFrame* aChildList); @@ -77,6 +78,10 @@ public: virtual PRBool GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues, nsString* aValues, nsString* aNames); + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + //nsTextControlFrame* GetTextFrame() { return mTextFrame; } //void SetTextFrame(nsTextControlFrame* aFrame) { mTextFrame = aFrame; } diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 7a175252859..efb631d80da 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -352,3 +352,13 @@ nsFileControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContext, { return 0; } + +NS_IMETHODIMP nsFileControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} diff --git a/mozilla/layout/forms/nsFileControlFrame.h b/mozilla/layout/forms/nsFileControlFrame.h index 7f0e8a7f208..9fad7f2b923 100644 --- a/mozilla/layout/forms/nsFileControlFrame.h +++ b/mozilla/layout/forms/nsFileControlFrame.h @@ -31,6 +31,10 @@ class nsFileControlFrame : public nsHTMLContainerFrame, public: nsFileControlFrame(); + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD Reflow(nsIPresContext& aCX, diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index 809f11de00a..5a51a8bf0f5 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -758,6 +758,17 @@ nsresult nsFormControlFrame::SetCurrentCheckState(PRBool aState) return res; } +NS_IMETHODIMP nsFormControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsFormControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + #if 0 >>>>>>> 1.41 diff --git a/mozilla/layout/forms/nsFormControlFrame.h b/mozilla/layout/forms/nsFormControlFrame.h index 3157bd28869..cc257148fbd 100644 --- a/mozilla/layout/forms/nsFormControlFrame.h +++ b/mozilla/layout/forms/nsFormControlFrame.h @@ -193,6 +193,11 @@ protected: virtual ~nsFormControlFrame(); + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + + /** * Get the size that this frame would occupy without any constraints * @param aPresContext the presentation context diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 42bbd356016..67137b7340f 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -119,6 +119,10 @@ public: void GetDefaultLabel(nsString& aLabel); + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + protected: NS_IMETHOD_(nsrefcnt) AddRef(void); NS_IMETHOD_(nsrefcnt) Release(void); @@ -727,4 +731,15 @@ nsHTMLButtonControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContex return 0; } +NS_IMETHODIMP nsHTMLButtonControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsHTMLButtonControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + diff --git a/mozilla/layout/forms/nsIFormControlFrame.h b/mozilla/layout/forms/nsIFormControlFrame.h index 6e069366b0f..11e0c6adf47 100644 --- a/mozilla/layout/forms/nsIFormControlFrame.h +++ b/mozilla/layout/forms/nsIFormControlFrame.h @@ -77,6 +77,24 @@ public: */ NS_IMETHOD GetFormContent(nsIContent*& aContent) const = 0; + /** + * Set a property on the form control frame + * @param aName name of the property to set + * @param aValue value of the property + * @returns NS_OK if the property name is valid, otherwise an error code + */ + + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue) = 0; + + /** + * Get a property from the form control frame + * @param aName name of the property to get + * @param aValue value of the property + * @returns NS_OK if the property name is valid, otherwise an error code + */ + + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue) = 0; + }; #endif diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index 83813d03962..c4b94ff67c8 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -105,6 +105,9 @@ public: float aPixToTwip, nscoord aInnerWidth, nscoord aCharWidth) const; + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); protected: void GetTranslatedRect(nsRect& aRect); // XXX this implementation is a copy of nsHTMLButtonControlFrame @@ -387,3 +390,13 @@ nsImageControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContext, { return 0; } + +NS_IMETHODIMP nsImageControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsImageControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} \ No newline at end of file diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index 00a378652da..c3d09295750 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -1584,6 +1584,17 @@ nsListControlFrame::GetSelectedItem(nsString & aStr) return NS_OK; } +NS_IMETHODIMP nsListControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsListControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + #if 0 //---------------------------------------------------------------------- NS_IMETHODIMP diff --git a/mozilla/layout/forms/nsListControlFrame.h b/mozilla/layout/forms/nsListControlFrame.h index 3b09b34f4dd..46460be9ac1 100644 --- a/mozilla/layout/forms/nsListControlFrame.h +++ b/mozilla/layout/forms/nsListControlFrame.h @@ -123,6 +123,11 @@ public: NS_IMETHOD Deselect(); + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + + #if 0 virtual void GetStyleSize(nsIPresContext& aContext, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 2ff02537b1e..436ccc99644 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -719,3 +719,13 @@ nsTextControlFrame::Paint(nsIPresContext& aPresContext, } return NS_OK; } + +NS_IMETHODIMP nsTextControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsTextControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} \ No newline at end of file diff --git a/mozilla/layout/forms/nsTextControlFrame.h b/mozilla/layout/forms/nsTextControlFrame.h index d57579b2faf..8b08931b93e 100644 --- a/mozilla/layout/forms/nsTextControlFrame.h +++ b/mozilla/layout/forms/nsTextControlFrame.h @@ -26,6 +26,10 @@ class nsIPresContext; class nsTextControlFrame : public nsFormControlFrame { public: + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + virtual nsWidgetInitData* GetWidgetInitData(nsIPresContext& aPresContext); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, diff --git a/mozilla/layout/html/forms/public/nsIFormControlFrame.h b/mozilla/layout/html/forms/public/nsIFormControlFrame.h index 6e069366b0f..11e0c6adf47 100644 --- a/mozilla/layout/html/forms/public/nsIFormControlFrame.h +++ b/mozilla/layout/html/forms/public/nsIFormControlFrame.h @@ -77,6 +77,24 @@ public: */ NS_IMETHOD GetFormContent(nsIContent*& aContent) const = 0; + /** + * Set a property on the form control frame + * @param aName name of the property to set + * @param aValue value of the property + * @returns NS_OK if the property name is valid, otherwise an error code + */ + + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue) = 0; + + /** + * Get a property from the form control frame + * @param aName name of the property to get + * @param aValue value of the property + * @returns NS_OK if the property name is valid, otherwise an error code + */ + + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue) = 0; + }; #endif diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp index 391cc5c7b86..3c714542f72 100644 --- a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp @@ -402,3 +402,13 @@ nsButtonControlFrame::PaintButton(nsIPresContext& aPresContext, } +NS_IMETHODIMP nsButtonControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsButtonControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.h b/mozilla/layout/html/forms/src/nsButtonControlFrame.h index 309ddb55529..24139746a75 100644 --- a/mozilla/layout/html/forms/src/nsButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.h @@ -23,6 +23,10 @@ class nsButtonControlFrame : public nsFormControlFrame { public: + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + NS_IMETHOD Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, diff --git a/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp index cdafc2ed43b..a1c80bcc254 100644 --- a/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp @@ -72,6 +72,10 @@ public: virtual void Reset(); + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + // // Methods used to GFX-render the checkbox // @@ -359,6 +363,15 @@ NS_METHOD nsCheckboxControlFrame::HandleEvent(nsIPresContext& aPresContext, return(nsFormControlFrame::HandleEvent(aPresContext, aEvent, aEventStatus)); } +NS_IMETHODIMP nsCheckboxControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsCheckboxControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index f44123cb093..14e385431d7 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -899,3 +899,14 @@ nsComboboxControlFrame::ListWasSelected(nsIPresContext* aPresContext) return NS_OK; } +NS_IMETHODIMP nsComboboxControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsComboboxControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h index 8b285a302ab..114cf251bf1 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h @@ -48,6 +48,7 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); // nsIFrame + NS_IMETHOD SetInitialChildList(nsIPresContext& aPresContext, nsIAtom* aListName, nsIFrame* aChildList); @@ -77,6 +78,10 @@ public: virtual PRBool GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues, nsString* aValues, nsString* aNames); + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + //nsTextControlFrame* GetTextFrame() { return mTextFrame; } //void SetTextFrame(nsTextControlFrame* aFrame) { mTextFrame = aFrame; } diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index 7a175252859..efb631d80da 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -352,3 +352,13 @@ nsFileControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContext, { return 0; } + +NS_IMETHODIMP nsFileControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.h b/mozilla/layout/html/forms/src/nsFileControlFrame.h index 7f0e8a7f208..9fad7f2b923 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.h @@ -31,6 +31,10 @@ class nsFileControlFrame : public nsHTMLContainerFrame, public: nsFileControlFrame(); + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD Reflow(nsIPresContext& aCX, diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index 809f11de00a..5a51a8bf0f5 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -758,6 +758,17 @@ nsresult nsFormControlFrame::SetCurrentCheckState(PRBool aState) return res; } +NS_IMETHODIMP nsFormControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsFormControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + #if 0 >>>>>>> 1.41 diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.h b/mozilla/layout/html/forms/src/nsFormControlFrame.h index 3157bd28869..cc257148fbd 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.h @@ -193,6 +193,11 @@ protected: virtual ~nsFormControlFrame(); + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + + /** * Get the size that this frame would occupy without any constraints * @param aPresContext the presentation context diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index 42bbd356016..67137b7340f 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -119,6 +119,10 @@ public: void GetDefaultLabel(nsString& aLabel); + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + protected: NS_IMETHOD_(nsrefcnt) AddRef(void); NS_IMETHOD_(nsrefcnt) Release(void); @@ -727,4 +731,15 @@ nsHTMLButtonControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContex return 0; } +NS_IMETHODIMP nsHTMLButtonControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsHTMLButtonControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + diff --git a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp index 83813d03962..c4b94ff67c8 100644 --- a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp @@ -105,6 +105,9 @@ public: float aPixToTwip, nscoord aInnerWidth, nscoord aCharWidth) const; + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); protected: void GetTranslatedRect(nsRect& aRect); // XXX this implementation is a copy of nsHTMLButtonControlFrame @@ -387,3 +390,13 @@ nsImageControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContext, { return 0; } + +NS_IMETHODIMP nsImageControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsImageControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} \ No newline at end of file diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index 00a378652da..c3d09295750 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -1584,6 +1584,17 @@ nsListControlFrame::GetSelectedItem(nsString & aStr) return NS_OK; } +NS_IMETHODIMP nsListControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsListControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + + #if 0 //---------------------------------------------------------------------- NS_IMETHODIMP diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.h b/mozilla/layout/html/forms/src/nsListControlFrame.h index 3b09b34f4dd..46460be9ac1 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.h +++ b/mozilla/layout/html/forms/src/nsListControlFrame.h @@ -123,6 +123,11 @@ public: NS_IMETHOD Deselect(); + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + + #if 0 virtual void GetStyleSize(nsIPresContext& aContext, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp index f50fe094775..d8f2dafaa38 100644 --- a/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp @@ -338,3 +338,14 @@ nsRadioControlFrame::Paint(nsIPresContext& aPresContext, } return NS_OK; } + +NS_IMETHODIMP nsRadioControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsRadioControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} + diff --git a/mozilla/layout/html/forms/src/nsRadioControlFrame.h b/mozilla/layout/html/forms/src/nsRadioControlFrame.h index 56507173f95..acbc9b5932b 100644 --- a/mozilla/layout/html/forms/src/nsRadioControlFrame.h +++ b/mozilla/layout/html/forms/src/nsRadioControlFrame.h @@ -29,6 +29,11 @@ class nsIAtom; class nsRadioControlFrame : public nsFormControlFrame { public: + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + + virtual void PostCreateWidget(nsIPresContext* aPresContext, nscoord& aWidth, nscoord& aHeight); diff --git a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp index 304b1d12cf3..0759884da0d 100644 --- a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp @@ -117,6 +117,10 @@ public: virtual void MouseClicked(nsIPresContext* aPresContext); + // nsIFormControLFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + protected: PRUint32 mNumRows; @@ -1006,3 +1010,14 @@ nsSelectControlFrame::MouseClicked(nsIPresContext* aPresContext) } } } + + +NS_IMETHODIMP nsSelectControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsSelectControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} \ No newline at end of file diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index 2ff02537b1e..436ccc99644 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -719,3 +719,13 @@ nsTextControlFrame::Paint(nsIPresContext& aPresContext, } return NS_OK; } + +NS_IMETHODIMP nsTextControlFrame::SetProperty(nsIAtom* aName, const nsString& aValue) +{ + return NS_OK; +} + +NS_IMETHODIMP nsTextControlFrame::GetProperty(nsIAtom* aName, nsString& aValue) +{ + return NS_OK; +} \ No newline at end of file diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.h b/mozilla/layout/html/forms/src/nsTextControlFrame.h index d57579b2faf..8b08931b93e 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.h +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.h @@ -26,6 +26,10 @@ class nsIPresContext; class nsTextControlFrame : public nsFormControlFrame { public: + // nsIFormControlFrame + NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue); + NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue); + virtual nsWidgetInitData* GetWidgetInitData(nsIPresContext& aPresContext); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,