Changeset 14704 in webkit
- Timestamp:
- Jun 2, 2006 6:41:00 PM (18 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r14703 r14704 1 2006-06-02 Adele Peterson <adele@apple.com> 2 3 Reviewed by Darin. 4 5 Windows theme for textareas. Also made some formatting changes. 6 7 * rendering/RenderThemeWin.cpp: 8 (WebCore::RenderThemeWin::supportsFocus): 9 (WebCore::RenderThemeWin::getThemeData): 10 (WebCore::RenderThemeWin::adjustButtonStyle): 11 (WebCore::RenderThemeWin::adjustTextFieldStyle): 12 (WebCore::RenderThemeWin::adjustTextAreaStyle): 13 (WebCore::RenderThemeWin::paintTextArea): 14 * rendering/RenderThemeWin.h: 15 (WebCore::RenderThemeWin::supportsHover): 16 1 17 2006-06-02 Krzysztof Kowalczyk <kkowalczyk@gmail.com> 2 18 -
trunk/WebCore/rendering/RenderThemeWin.cpp
r14560 r14704 154 154 case ButtonAppearance: 155 155 case TextFieldAppearance: 156 case TextAreaAppearance: 156 157 return true; 157 158 default: … … 198 199 break; 199 200 case TextFieldAppearance: 201 case TextAreaAppearance: 200 202 result.m_part = TFP_TEXTFIELD; 201 203 result.m_state = determineState(o); … … 206 208 } 207 209 208 void RenderThemeWin::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const210 void RenderThemeWin::adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 209 211 { 210 212 addIntrinsicMargins(style); … … 293 295 } 294 296 295 void RenderThemeWin::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const297 void RenderThemeWin::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 296 298 { 297 299 addIntrinsicMargins(style); … … 323 325 } 324 326 325 } 327 void RenderThemeWin::adjustTextAreaStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 328 { 329 addIntrinsicMargins(style); 330 } 331 332 bool RenderThemeWin::paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) 333 { 334 return paintTextField(o, i, r); 335 } 336 337 } -
trunk/WebCore/rendering/RenderThemeWin.h
r13835 r14704 47 47 48 48 // A method asking if the theme's controls actually care about redrawing when hovered. 49 virtual bool supportsHover(const RenderStyle* style) const { return true; }49 virtual bool supportsHover(const RenderStyle*) const { return true; } 50 50 51 51 virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) 52 52 { return paintButton(o, i, r); } 53 virtual void setCheckboxSize(RenderStyle* style) const;53 virtual void setCheckboxSize(RenderStyle*) const; 54 54 55 55 virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) 56 56 { return paintButton(o, i, r); } 57 virtual void setRadioSize(RenderStyle* style) const;57 virtual void setRadioSize(RenderStyle*) const; 58 58 59 virtual void adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;60 virtual bool paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r);59 virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const; 60 virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); 61 61 62 virtual void adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const; 63 virtual bool paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r); 62 virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const; 63 virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); 64 65 virtual void adjustTextAreaStyle(CSSStyleSelector*, RenderStyle*, WebCore::Element*) const; 66 virtual bool paintTextArea(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); 64 67 65 68 private: 66 void addIntrinsicMargins(RenderStyle* style) const;69 void addIntrinsicMargins(RenderStyle*) const; 67 70 void close(); 68 71 69 unsigned determineState(RenderObject* o);70 bool supportsFocus(EAppearance appearance);72 unsigned determineState(RenderObject*); 73 bool supportsFocus(EAppearance); 71 74 72 ThemeData getThemeData(RenderObject* o);75 ThemeData getThemeData(RenderObject*); 73 76 74 77 HMODULE m_themeDLL;
Note: See TracChangeset
for help on using the changeset viewer.