Use wxGetTranslation() instead of _() in the public headers.

[wxWidgets.git] / include / wx / windowid.h

diff --git a/include/wx/windowid.h b/include/wx/windowid.h
index 4b2e3e171c42b5ea8ddac2e92ca361fd4e8fdde4..0c174b5f0c6e8a51e49d761028ac969b2cc43ebf 100644 (file)
--- a/include/wx/windowid.h
+++ b/include/wx/windowid.h
@@ -3,7 +3,6 @@
 // Purpose:     wxWindowID class - a class for managing window ids
 // Author:      Brian Vanderburg II
 // Created:     2007-09-21
-// RCS-ID:      $Id$
 // Copyright:   (c) 2007 Brian Vanderburg II
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -43,7 +42,7 @@ public:
 
     wxWindowIDRef(long id)
     {
-        Init(id);
+        Init(wxWindowID(id));
     }
 
     wxWindowIDRef(const wxWindowIDRef& id)
@@ -66,13 +65,14 @@ public:
 
     wxWindowIDRef& operator=(long id)
     {
-        Assign(id);
+        Assign(wxWindowID(id));
         return *this;
     }
 
     wxWindowIDRef& operator=(const wxWindowIDRef& id)
     {
-        Assign(id.m_id);
+        if (&id != this)
+            Assign(id.m_id);
         return *this;
     }