another AIX compilation fix: getservbyname_r() returns int, not servent* there

[wxWidgets.git] / interface / wx / dcbuffer.h

diff --git a/interface/wx/dcbuffer.h b/interface/wx/dcbuffer.h
index c792ec8829773036ce451f27f4d70664f2850213..55c61c9483f9afe8844c68306aae46a43e8b87c8 100644 (file)
--- a/interface/wx/dcbuffer.h
+++ b/interface/wx/dcbuffer.h
@@ -67,6 +67,7 @@ public:
     */
     wxBufferedDC(wxDC* dc, const wxSize& area,
                  int style = wxBUFFER_CLIENT_AREA);
     */
     wxBufferedDC(wxDC* dc, const wxSize& area,
                  int style = wxBUFFER_CLIENT_AREA);

+

     /**
         Creates a buffer for the provided dc. Init() must not be called when
         using this constructor.
     /**
         Creates a buffer for the provided dc. Init() must not be called when
         using this constructor.


@@ -86,7 +87,7 @@ public:
             window is buffered, or wxBUFFER_VIRTUAL_AREA to indicate that the
             buffer bitmap covers the virtual area.
     */
             window is buffered, or wxBUFFER_VIRTUAL_AREA to indicate that the
             buffer bitmap covers the virtual area.
     */

-    wxBufferedDC(wxDC* dc, wxBitmap& buffer,
+    wxBufferedDC(wxDC* dc, wxBitmap& buffer = wxNullBitmap,

                  int style = wxBUFFER_CLIENT_AREA);
     //@}
 
                  int style = wxBUFFER_CLIENT_AREA);
     //@}
 


@@ -94,7 +95,7 @@ public:
         Copies everything drawn on the DC so far to the underlying DC
         associated with this object, if any.
     */
         Copies everything drawn on the DC so far to the underlying DC
         associated with this object, if any.
     */

-    ~wxBufferedDC();
+    virtual ~wxBufferedDC();

 
     //@{
     /**
 
     //@{
     /**


@@ -103,7 +104,7 @@ public:
     */
     void Init(wxDC* dc, const wxSize& area,
               int style = wxBUFFER_CLIENT_AREA);
     */
     void Init(wxDC* dc, const wxSize& area,
               int style = wxBUFFER_CLIENT_AREA);

-    void Init(wxDC* dc, wxBitmap& buffer,
+    void Init(wxDC* dc, wxBitmap& buffer = wxNullBitmap,

               int style = wxBUFFER_CLIENT_AREA);
     //@}
 };
               int style = wxBUFFER_CLIENT_AREA);
     //@}
 };


@@ -185,6 +186,6 @@ public:
         Copies everything drawn on the DC so far to the window associated with
         this object, using a wxPaintDC.
     */
         Copies everything drawn on the DC so far to the window associated with
         this object, using a wxPaintDC.
     */

-    ~wxBufferedPaintDC();
+    virtual ~wxBufferedPaintDC();

 };
 
 };