2.7.2 ok?

[Francesco Montorsi]

Stefan.Neis at t-online.de ha scritto:
>         Hi,
> =

>> I think it should be ok to make the release with the current
>> (2006-10-31 11:18 UTC) sources. I propose that if no objections are
>> posted to this thread in, say, an hour, then the release should go
>> ahead. It would probably be also better to hold back non essential
>> commits until then.
> =

> Actually, something seems to have broken OS/2 build - at least as of
> eight
> hours ago, see Dave Parsons' rebuild page: =

> http://cdl-systems.homepage.t-online.de/makelibs-20061031-040436.log
> so if somebody would be able to fix whatever is wrong in include/wx/os2/
> {pen.h, brush.h}, that would be great - unfortunately, I can't do
> anything
> about it ATM.
sorry for them.
Looking at the log I think the attached patch should fix them (but I =

couldn't test it!)

Francesco


-------------- next part --------------
Index: include/wx/os2/brush.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/os2/brush.h,v
retrieving revision 1.18
diff -bu2 -r1.18 include/wx/os2/brush.h
--- include/wx/os2/brush.h
+++ include/wx/os2/brush.h
@@ -27,4 +27,11 @@
     virtual ~wxBrushRefData();
 =

+    bool operator =3D=3D (const wxBrushRefData& data) const
+    {
+        return (m_nStyle =3D=3D data.m_nStyle &&
+                m_vStipple.IsSameAs(data.m_vStipple) &&
+                m_vColour =3D=3D data.m_vColour);
+    }
+
 protected:
     int         m_nStyle;
Index: include/wx/os2/pen.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/os2/pen.h,v
retrieving revision 1.20
diff -bu2 -r1.20 include/wx/os2/pen.h
--- include/wx/os2/pen.h
+++ include/wx/os2/pen.h
@@ -36,6 +36,6 @@
                m_nCap =3D=3D data.m_nCap &&
                m_vColour =3D=3D data.m_vColour &&
-               (m_style !=3D wxSTIPPLE || m_stipple.IsSameAs(data.m_stippl=
e)) &&
-               (m_style !=3D wxUSER_DASH ||
+               (m_nStyle !=3D wxSTIPPLE || m_vStipple.IsSameAs(data.m_vSti=
pple)) &&
+               (m_nStyle !=3D wxUSER_DASH ||
                 (m_dash =3D=3D data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) =
=3D=3D 0));
@@ -73,5 +73,5 @@
     inline bool   operator =3D=3D (const wxPen& rPen) const
     {
-        const wxPenRefData *penData =3D (wxPenRefData *)pen.m_refData;
+        const wxPenRefData *penData =3D (wxPenRefData *)rPen.m_refData;
 =

         // an invalid pen is only equal to another invalid pen
Index: src/os2/brush.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/os2/brush.cpp,v
retrieving revision 1.20
diff -bu2 -r1.20 src/os2/brush.cpp
--- src/os2/brush.cpp
+++ src/os2/brush.cpp
@@ -292,2 +292,15 @@
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS
+
+
+bool wxBrush::operator =3D=3D (
+    const wxBrush& brush
+) const
+{
+    if (m_refData =3D=3D brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData =3D=3D *(wxBrushRefData*)brush.m_=
refData );
+} // end of wxBrush::operator =3D=3D
+