renamed IsRefTo() to IsSameAs() (do complain if this is not more clear) and

changed its signature to take a const reference instead of a pointer which
simplifies the code and makes it safer as well

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 3827c1c3310aa63ea782bcc8d4deb24880834fb1..4d19f0f087b45bdf88a99e3b4689debdd582defc 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -30,7 +30,7 @@ Changes in behaviour which may result in compilation errors
   used to work in somewhat unexpected way as it compared only internal pointers
   and not the object data. The code using it will have to be updated:
   * If the object was compared with wxNullXXX, use IsOk() method instead
   used to work in somewhat unexpected way as it compared only internal pointers
   and not the object data. The code using it will have to be updated:
   * If the object was compared with wxNullXXX, use IsOk() method instead

-  * If valid object need to be compated, use IsRefTo() to reproduce the old
+  * If valid object need to be compated, use IsSameAs() to reproduce the old

     behaviour or change the code to avoid comparing bitmaps &c
 - wxFontData::GetColour() now returns a const colour.
 - wxDC objects can't be created directly now (this never worked, now it doesn't
     behaviour or change the code to avoid comparing bitmaps &c
 - wxFontData::GetColour() now returns a const colour.
 - wxDC objects can't be created directly now (this never worked, now it doesn't

diff --git a/docs/latex/wx/object.tex b/docs/latex/wx/object.tex
index 4332aa6a023481475da2fb184926292bdddf161c..e5999513cd2c874da8b16789a89df980bb315cd5 100644 (file)
--- a/docs/latex/wx/object.tex
+++ b/docs/latex/wx/object.tex
@@ -116,12 +116,15 @@ this one or is derived from it.
   bool tmp = obj->IsKindOf(CLASSINFO(wxFrame));
 \end{verbatim}
 
   bool tmp = obj->IsKindOf(CLASSINFO(wxFrame));
 \end{verbatim}
 

-\membersection{wxObject::IsRefTo}\label{wxobjectisrefto}
+\membersection{wxObject::IsSameAs}\label{wxobjectissameas}

 
 

-\func{bool}{IsRefTo}{\param{const wxObject *}{ obj}}
+\func{bool}{IsSameAs}{\param{const wxObject\& }{ obj}}

 
 

-Returns \true if this object is referencing the \arg{obj}'s data.
-Note that this function only does a {\tt shallow} comparison.
+Returns \true if this object has the same data pointer as \arg{obj}. Notice
+that \true is returned if the data pointers are \NULL in both objects.
+
+This function only does a \emph{shallow} comparison, i.e. it doesn't compare
+the objects pointed to by the data pointers of these objects.

 
 \membersection{wxObject::Ref}\label{wxobjectref}
 
 
 \membersection{wxObject::Ref}\label{wxobjectref}
 

diff --git a/docs/latex/wx/trefcount.tex b/docs/latex/wx/trefcount.tex
index eb280c5c78be331987e581696e6a6548e0883202..c051acc1b1a081bbcb9da3d3373e8b80a166aab5 100644 (file)
--- a/docs/latex/wx/trefcount.tex
+++ b/docs/latex/wx/trefcount.tex
@@ -35,7 +35,7 @@ That's why not all reference-counted wxWidgets classes provide comparison operat
 
 Also note that if you only need to do a {\tt shallow} comparison between two
 \helpref{wxObject}{wxobject}-derived classes, you should not use the $==$ and $!=$ operators
 
 Also note that if you only need to do a {\tt shallow} comparison between two
 \helpref{wxObject}{wxobject}-derived classes, you should not use the $==$ and $!=$ operators

-but rather the \helpref{wxObject::IsRefTo}{wxobjectisrefto} function.
+but rather the \helpref{wxObject::IsSameAs}{wxobjectissameas} function.

 
 
 \subsection{Object destruction}\label{refcountdestruct}
 
 
 \subsection{Object destruction}\label{refcountdestruct}

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 4c07343d229532ec9e46df178dd7751d75296265..511d9a456c9a148722d6b88b87e5bd49e8748247 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -36,7 +36,7 @@ public:
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&

                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index d35cd47a2dea4339d2c79175b892b621e732b29d..470d92c6dc53ef3e1895b03d28f68f81c392ec94 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -36,7 +36,7 @@ public:
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&

                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));

diff --git a/include/wx/object.h b/include/wx/object.h
index b7de67c0fe1b958095b3d6f150dda5b3d0bee424..f9d9f2be9bccfbc3bfa367b27b7e4d119324c108 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -476,9 +476,8 @@ public:
     // Make sure this object has only one reference
     void UnShare() { AllocExclusive(); }
 
     // Make sure this object has only one reference
     void UnShare() { AllocExclusive(); }
 

-    // Do a shallow comparison of our referenced data with the given object's
-    // refdata
-    bool IsRefTo(const wxObject *p) const { return m_refData == p->m_refData; }
+    // check if this object references the same data as the other one
+    bool IsSameAs(const wxObject& o) const { return m_refData == o.m_refData; }

 
 protected:
     // ensure that our data is not shared with anybody else: if we have no
 
 protected:
     // ensure that our data is not shared with anybody else: if we have no

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index d192842d2c546c4c6399e2db7958f1462f850c24..1656eec288db301893de0dbf4cd54749683c8dfd 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -35,7 +35,7 @@ public:
                m_nJoin == data.m_nJoin &&
                m_nCap == data.m_nCap &&
                m_vColour == data.m_vColour &&
                m_nJoin == data.m_nJoin &&
                m_nCap == data.m_nCap &&
                m_vColour == data.m_vColour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&

                (m_style != wxUSER_DASH ||
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
                (m_style != wxUSER_DASH ||
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));

diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index 7ad901706c49a2d0739a582418d243dfff71e569..4edd52052f24522c5dc04405411bf536c465bb81 100644 (file)
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -36,7 +36,7 @@ public:
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&

                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));

diff --git a/include/wx/variant.h b/include/wx/variant.h
index d5483080e8ae5409822fce5c5c6456d3e27ae9c3..5d971dbba763a115691ea56ce1a33987873ab215 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -397,7 +397,7 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
 
 
 // implements a wxVariantData-derived class using for the Eq() method a shallow
 
 
 // implements a wxVariantData-derived class using for the Eq() method a shallow

-// comparison (through wxObject::IsRefTo function)
+// comparison (through wxObject::IsSameAs function)

 #define IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname,expdecl) \
 IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,expdecl) \
 \
 #define IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname,expdecl) \
 IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,expdecl) \
 \


@@ -407,7 +407,7 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
 \
     classname##VariantData & otherData = (classname##VariantData &) data;\
 \
 \
     classname##VariantData & otherData = (classname##VariantData &) data;\
 \

-    return (otherData.m_value.IsRefTo(&m_value));\
+    return (otherData.m_value.IsSameAs(m_value));\

 }\
 
 
 }\
 
 

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index d03c8cb8785669d3d4df60a3893447b6f48c334f..3dc6813f7b86298eebfafe8bfa2806aaa75c0d16 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1023,7 +1023,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
     // setting an invalid cursor is ok, it means that we don't have any special
     // cursor
 {
     // setting an invalid cursor is ok, it means that we don't have any special
     // cursor

-    if ( m_cursor.IsRefTo(&cursor) )
+    if ( m_cursor.IsSameAs(cursor) )

     {
         // no change
         return false;
     {
         // no change
         return false;

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 138f1c6680fb63680f18c815680ebd550b0fd0ff..385a10d8b866151691ab633d5c0e6eefee4f1701 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -631,7 +631,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         if ( !bmpPrev.Ok() )
             bmpPrev = m_bitmap;
 
         if ( !bmpPrev.Ok() )
             bmpPrev = m_bitmap;
 

-        if ( !bmp.IsRefTo(&bmpPrev) )
+        if ( !bmp.IsSameAs(bmpPrev) )

             m_statbmp->SetBitmap(bmp);
     }
 #endif // wxUSE_STATBMP
             m_statbmp->SetBitmap(bmp);
     }
 #endif // wxUSE_STATBMP

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 1cc7e69e1f7dc0577981c82129c61ef86604a79e..4c54c10897509213764cbf43167b00c63eb20ff8 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -40,7 +40,7 @@ public:
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&

-                m_stipple.IsRefTo(&data.m_stipple) &&
+                m_stipple.IsSameAs(data.m_stipple) &&

                 m_colour == data.m_colour);
     }
 
                 m_colour == data.m_colour);
     }
 

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 25536d5518c553eac84c2240386e6cb3425fb5f9..3b9330bb1a42ded7ae74d126376f56db9b75a064 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -41,7 +41,7 @@ public:
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&

-                m_stipple.IsRefTo(&data.m_stipple) &&
+                m_stipple.IsSameAs(data.m_stipple) &&

                 m_colour == data.m_colour);
     }
 
                 m_colour == data.m_colour);
     }
 

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index b0fa74aa0ac87a70222ce5e414e01a838b94184d..95bb600893dae535b04726ee51b73a722ba6fe18 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -33,7 +33,7 @@ public:
     bool operator == ( const wxBrushRefData& brush ) const
     {
         return m_style == brush.m_style &&
     bool operator == ( const wxBrushRefData& brush ) const
     {
         return m_style == brush.m_style &&

-                m_stipple.IsRefTo(&brush.m_stipple) &&
+                m_stipple.IsSameAs(brush.m_stipple) &&

                 m_colour == brush.m_colour &&
                 m_macBrushKind == brush.m_macBrushKind &&
                 m_macThemeBrush == brush.m_macThemeBrush &&
                 m_colour == brush.m_colour &&
                 m_macBrushKind == brush.m_macBrushKind &&
                 m_macThemeBrush == brush.m_macThemeBrush &&

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 719f9376d08a5ae8cbf6be71967167e67905fffa..5cb844f3c0d3ab752c895d9743854638d46b0b6f 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1661,7 +1661,7 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {

-    if (m_cursor.IsRefTo(&cursor))
+    if (m_cursor.IsSameAs(cursor))

         return false;
 
     if (!cursor.IsOk())
         return false;
 
     if (!cursor.IsOk())

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index d97544d123efefa6c89c51ef08ea790a095c369a..cb542c34f8c1b2d98b5b93803b40eab8eb8f93c9 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -79,7 +79,7 @@ public:
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&

-                m_stipple.IsRefTo(&data.m_stipple) &&
+                m_stipple.IsSameAs(data.m_stipple) &&

                 m_colour == data.m_colour);
     }
 
                 m_colour == data.m_colour);
     }
 

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 5879052da596f7efada4ef8e602688346b628602..45820afcacb297ca14c21354c970736962f10b3b 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -42,7 +42,7 @@ class wxPenRefData: public wxObjectRefData
                m_capStyle == data.m_capStyle &&
                m_joinStyle == data.m_joinStyle &&
                m_colour == data.m_colour &&
                m_capStyle == data.m_capStyle &&
                m_joinStyle == data.m_joinStyle &&
                m_colour == data.m_colour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&

                (m_style != wxUSER_DASH ||
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
                (m_style != wxUSER_DASH ||
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index eb3c21d0024440451b562da2515d202c646a2e87..8f0e645b31916ca1e2e34a9878826849d4215e16 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -124,7 +124,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
     // don't compare HBRUSHes
     return m_style == data.m_style &&
            m_colour == data.m_colour &&
     // don't compare HBRUSHes
     return m_style == data.m_style &&
            m_colour == data.m_colour &&

-           m_stipple.IsRefTo(&data.m_stipple);
+           m_stipple.IsSameAs(data.m_stipple);

 }
 
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 }
 
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index 9aeb1581151e2c7455af9aff8976e26605edf423..d74f7458274f5b87369cd022caf20b4628efdbf7 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -42,7 +42,7 @@ public:
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&

-                m_stipple.IsRefTo(&data.m_stipple) &&
+                m_stipple.IsSameAs(&data.m_stipple) &&

                 m_colour == data.m_colour);
     }
 
                 m_colour == data.m_colour);
     }