Changeset 429 for trunk/WebCore/platform/wx/RenderThemeWx.cpp

Timestamp:

08/04/08 12:23:14 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35534

Files:

• trunk/WebCore/platform/wx/RenderThemeWx.cpp (modified) (10 diffs)

trunk/WebCore/platform/wx/RenderThemeWx.cpp

@@ -30 +30 @@
-#include "FrameView.h"
-#include "GraphicsContext.h"
+#include "NotImplemented.h"
-#include "RenderView.h"
+
+#include "WebKit/wx/WebView.h"
-
-#include <wx/defs.h>
@@ -61 +64 @@
-    virtual void setRadioSize(RenderStyle*) const;
-
+    virtual void adjustRepaintRect(const RenderObject*, IntRect&);
+
-    virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
-    virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
@@ -67 +72 @@
-    virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
-
+    virtual int minimumMenuListSize(RenderStyle*) const;
+
+    virtual void adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
+    virtual bool paintMenuList(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+
+    virtual void adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
+    virtual bool paintMenuListButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+
-    virtual bool isControlStyled(const RenderStyle*, const BorderData&,
-                                 const FillLayer&, const Color&) const;
@@ -79 +92 @@
-    virtual Color platformActiveSelectionForegroundColor() const;
-    virtual Color platformInactiveSelectionForegroundColor() const;
+    
+    virtual int popupInternalPaddingLeft(RenderStyle*) const;
+    virtual int popupInternalPaddingRight(RenderStyle*) const;
+    virtual int popupInternalPaddingTop(RenderStyle*) const;
+    virtual int popupInternalPaddingBottom(RenderStyle*) const;
-
-private:
@@ -87 +105 @@
-};
-
+
+// Constants
+
+#define MINIMUM_MENU_LIST_SIZE 21
+#define POPUP_INTERNAL_PADDING_LEFT 6
+#define POPUP_INTERNAL_PADDING_TOP 2
+#define POPUP_INTERNAL_PADDING_BOTTOM 2
+
+#ifdef __WXMAC__
+#define POPUP_INTERNAL_PADDING_RIGHT 22
+#else
+#define POPUP_INTERNAL_PADDING_RIGHT 20
+#endif
+
-RenderTheme* theme()
-{
@@ -100 +132 @@
-
-    return RenderTheme::isControlStyled(style, border, background, backgroundColor);
+}
+
+void RenderThemeWx::adjustRepaintRect(const RenderObject* o, IntRect& r)
+{
+    switch (o->style()->appearance()) {
+        case MenulistAppearance: {
+            r.setWidth(r.width() + 100);
+            break;
+        }
+        default:
+            break;
+    }
-}
-
@@ -191 +235 @@
-    wxWindow* window = o->view()->frameView()->nativeWindow();
-    wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
-    wxASSERT(dc->IsOk());
-
-    int flags = 0;
-    
@@ -207 +249 @@
-    if (appearance == PushButtonAppearance || appearance == ButtonAppearance)
-        wxRendererNative::Get().DrawPushButton(window, *dc, r, flags);
-
-
+
+
+
+
+
-    else if(appearance == CheckboxAppearance) {
-        if (isChecked(o))
@@ -214 +259 @@
-        wxRendererNative::Get().DrawCheckBox(window, *dc, r, flags);
-    }
+    return false;
+}
+
+void RenderThemeWx::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
+{
+    
+}
+
+bool RenderThemeWx::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+{
+    wxWindow* window = o->view()->frameView()->nativeWindow();
+    wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
+    wxRenderer_DrawTextCtrl(window, *dc, r, 0);
+    return false;
+}
+
+int RenderThemeWx::minimumMenuListSize(RenderStyle*) const 
+{ 
+    return MINIMUM_MENU_LIST_SIZE; 
+}
+
+void RenderThemeWx::adjustMenuListStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
+{
+}
+    
+bool RenderThemeWx::paintMenuList(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+{
+    wxWindow* window = o->view()->frameView()->nativeWindow();
+    wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
+    
+    int flags = 0;      
+    if (!isEnabled(o))
+        flags |= wxCONTROL_DISABLED;
-        
+    if (supportsFocus(o->style()->appearance()) && isFocused(o))
+        flags |= wxCONTROL_FOCUSED;
+
+    if (isPressed(o))
+        flags |= wxCONTROL_PRESSED;
+
+    wxRenderer_DrawChoice(window, *dc, r, flags);
+
-    return false;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return false;
-}
-
+    
-Color RenderThemeWx::platformActiveSelectionBackgroundColor() const
-{
@@ -263 +359 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+