Changeset 53373 in webkit

Timestamp:

Jan 17, 2010 3:39:25 PM (14 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

[wx] On Win and GTK, we need to manually apply the transforms when falling back
to GDI / GDK drawing, but this is not needed on Mac since we always use CG there.

​https://bugs.webkit.org/show_bug.cgi?id=33730

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/wx/RenderThemeWx.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-17  Kevin Watters  <kevinwatters@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] On Win and GTK, we need to manually apply the transforms when falling back
+        to GDI / GDK drawing, but this is not needed on Mac since we always use CG there.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=33730
+
+        * platform/wx/RenderThemeWx.cpp:
+        (WebCore::RenderThemeWx::paintButton):
+
 2010-01-17  Martin Robinson  <martin.james.robinson@gmail.com>
 

trunk/WebCore/platform/wx/RenderThemeWx.cpp

@@ -268 +268 @@
     IntRect rect = r; 
 
-#if USE(WXGC)
+// On Mac, wxGraphicsContext and wxDC share the same native implementation,
+// and so transformations are available.
+// On Win and Linux, however, this is not true and transforms are lost,
+// so we need to restore them here.
+#if USE(WXGC) && !defined(__WXMAC__)
     double xtrans = 0;
     double ytrans = 0;
@@ -295 +299 @@
             flags |= wxCONTROL_CHECKED;
 #if wxCHECK_VERSION(2,9,1)
-        wxRendererNative::Get().DrawRadioBitmap(window, *dc, r, flags);
+        wxRendererNative::Get().DrawRadioBitmap(window, *dc, rect, flags);
 #elif wxCHECK_VERSION(2,9,0)
         wxRendererNative::Get().DrawRadioButton(window, *dc, rect, flags);