added check for self-assignment to wxPrintData::operator=() (thanks HP aCC for a...

[wxWidgets.git] / src / msw / registry.cpp

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 1def8c5dfed9ebee1c617be1471c71ff73048bdb..40670646736fbf7fc64c441a93f4b06f8677087c 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -1197,7 +1197,7 @@ FormatAsHex(const void *data,
 
     // write all the rest as comma-separated bytes
     value.reserve(3*size + 10);
 
     // write all the rest as comma-separated bytes
     value.reserve(3*size + 10);

-    const char * const p = wx_static_cast(const char *, data);
+    const char * const p = static_cast<const char *>(data);

     for ( size_t n = 0; n < size; n++ )
     {
         // TODO: line wrapping: although not required by regedit, this makes
     for ( size_t n = 0; n < size; n++ )
     {
         // TODO: line wrapping: although not required by regedit, this makes


@@ -1364,7 +1364,7 @@ bool wxRegKey::DoExport(wxOutputStream& ostr) const
     // dump all our values
     long dummy;
     wxString name;
     // dump all our values
     long dummy;
     wxString name;

-    wxRegKey& self = wx_const_cast(wxRegKey&, *this);
+    wxRegKey& self = const_cast<wxRegKey&>(*this);

     bool cont = self.GetFirstValue(name, dummy);
     while ( cont )
     {
     bool cont = self.GetFirstValue(name, dummy);
     while ( cont )
     {