Complete rewrite of DoDrawBitmap() and DoBlit().

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 136f6eeb19b0940c28ab8817fd2e7003e6d255dd..4cc340aa518fa7248e26b58781b93958a3596c5a 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -88,7 +88,7 @@ public:
     {
         wxCharTypeBuffer buf;
         if ( str )
-            buf.m_data = new Data(wx_const_cast(CharType*, str), Data::NonOwned);
+            buf.m_data = new Data(const_cast<CharType*>(str), Data::NonOwned);
         return buf;
     }
 
@@ -110,7 +110,7 @@ public:
 
         CharType * const p = m_data->Get();
 
-        wxCharTypeBuffer *self = wx_const_cast(wxCharTypeBuffer*, this);
+        wxCharTypeBuffer *self = const_cast<wxCharTypeBuffer*>(this);
         self->m_data->Set(NULL);
         self->DecRef();
 
@@ -179,10 +179,10 @@ public:
 
 private:
     // reference-counted data
-    struct Data : wxPrivate::UntypedBufferData
+    struct Data : public wxPrivate::UntypedBufferData
     {
         Data(CharType *str, Kind kind = Owned)
-            : UntypedBufferData(str, kind)
+            : wxPrivate::UntypedBufferData(str, kind)
         {
         }