fix (harmless for now) g++ warning about non-virtual dtor

[wxWidgets.git] / src / common / convauto.cpp

diff --git a/src/common/convauto.cpp b/src/common/convauto.cpp
index d23fad635e145de3ca4ef4cb0976c085da777f9b..9d5818333dd391fcd468465d675195d87a1c14d9 100644 (file)
--- a/src/common/convauto.cpp
+++ b/src/common/convauto.cpp
@@ -194,7 +194,7 @@ wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
     // during this initial call but also during the first call with non-NULL
     // dst as typically we're first called with NULL dst to calculate the
     // needed buffer size
     // during this initial call but also during the first call with non-NULL
     // dst as typically we're first called with NULL dst to calculate the
     // needed buffer size

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

     if ( !m_conv )
     {
         self->InitFromInput(&src, &srcLen);
     if ( !m_conv )
     {
         self->InitFromInput(&src, &srcLen);


@@ -238,7 +238,7 @@ wxConvAuto::FromWChar(char *dst, size_t dstLen,
     if ( !m_conv )
     {
         // default to UTF-8 for the multibyte output
     if ( !m_conv )
     {
         // default to UTF-8 for the multibyte output

-        wx_const_cast(wxConvAuto *, this)->InitWithUTF8();
+        const_cast<wxConvAuto *>(this)->InitWithUTF8();

     }
 
     return m_conv->FromWChar(dst, dstLen, src, srcLen);
     }
 
     return m_conv->FromWChar(dst, dstLen, src, srcLen);