fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 97d6f5e00b6e1a8f8f67eeaeeb67d0508ee59771..8e12d632744ffcf5ea18513dd82a2e779848ea5f 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -31,6 +31,7 @@ public:
         InitFromStream(stream, lenFile);
     }
     wxMemoryInputStream(wxMemoryInputStream& stream)
         InitFromStream(stream, lenFile);
     }
     wxMemoryInputStream(wxMemoryInputStream& stream)

+        : wxInputStream()

     {
         InitFromStream(stream, wxInvalidOffset);
     }
     {
         InitFromStream(stream, wxInvalidOffset);
     }


@@ -64,7 +65,7 @@ private:
 
     // copy ctor is implemented above: it copies the other stream in this one
     DECLARE_ABSTRACT_CLASS(wxMemoryInputStream)
 
     // copy ctor is implemented above: it copies the other stream in this one
     DECLARE_ABSTRACT_CLASS(wxMemoryInputStream)

-    DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream)
+    wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
 };
 
 class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream


@@ -94,7 +95,7 @@ protected:
     wxFileOffset OnSysTell() const;
 
     DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
     wxFileOffset OnSysTell() const;
 
     DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)

-    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);

 };
 
 #if WXWIN_COMPATIBILITY_2_6
 };
 
 #if WXWIN_COMPATIBILITY_2_6