<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[28970] trunk/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28970">28970</a></dd>
<dt>Author</dt> <dd>kevino@webkit.org</dd>
<dt>Date</dt> <dd>2007-12-23 18:09:00 -0800 (Sun, 23 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove getWxBitmap as we have nativeImageForCurrentFrame now, and don't draw a border in fillRect.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsBitmapImageh">trunk/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkWebCoreplatformgraphicswxGraphicsContextWxcpp">trunk/WebCore/platform/graphics/wx/GraphicsContextWx.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicswxImageWxcpp">trunk/WebCore/platform/graphics/wx/ImageWx.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (28969 => 28970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-12-24 00:47:05 UTC (rev 28969)
+++ trunk/WebCore/ChangeLog        2007-12-24 02:09:00 UTC (rev 28970)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-12-23  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Reviewed by Eric Seidel.
+
+        Remove getWxBitmap as we have nativeImageForCurrentFrame now,
+        and don't draw a border in fillRect.
+
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/wx/GraphicsContextWx.cpp:
+        (WebCore::GraphicsContext::fillRect):
+        * platform/graphics/wx/ImageWx.cpp:
+
</ins><span class="cx"> 2007-12-23  Alp Toker  &lt;alp@atoker.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Holger Freyther.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/BitmapImage.h (28969 => 28970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/BitmapImage.h        2007-12-24 00:47:05 UTC (rev 28969)
+++ trunk/WebCore/platform/graphics/BitmapImage.h        2007-12-24 02:09:00 UTC (rev 28970)
</span><span class="lines">@@ -127,10 +127,6 @@
</span><span class="cx">     virtual bool getHBITMAPOfSize(HBITMAP, LPSIZE);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(WX)
-    virtual wxBitmap* getWxBitmap() const;
-#endif
-
</del><span class="cx">     virtual NativeImagePtr nativeImageForCurrentFrame() { return frameAtIndex(currentFrame()); }
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswxGraphicsContextWxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/wx/GraphicsContextWx.cpp (28969 => 28970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/wx/GraphicsContextWx.cpp        2007-12-24 00:47:05 UTC (rev 28969)
+++ trunk/WebCore/platform/graphics/wx/GraphicsContextWx.cpp        2007-12-24 02:09:00 UTC (rev 28970)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">     if (paintingDisabled())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    m_data-&gt;context-&gt;SetPen(wxPen(color));
</del><ins>+    m_data-&gt;context-&gt;SetPen(*wxTRANSPARENT_PEN);
</ins><span class="cx">     m_data-&gt;context-&gt;SetBrush(wxBrush(color));
</span><span class="cx">     m_data-&gt;context-&gt;DrawRectangle(rect.x(), rect.y(), rect.width(), rect.height());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswxImageWxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/wx/ImageWx.cpp (28969 => 28970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/wx/ImageWx.cpp        2007-12-24 00:47:05 UTC (rev 28969)
+++ trunk/WebCore/platform/graphics/wx/ImageWx.cpp        2007-12-24 02:09:00 UTC (rev 28970)
</span><span class="lines">@@ -182,9 +182,4 @@
</span><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-wxBitmap* BitmapImage::getWxBitmap() const
-{
-    return const_cast&lt;BitmapImage*&gt;(this)-&gt;frameAtIndex(0);
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre>
</div>
</div>

</body>
</html>