pragma fix for gcc

[wxWidgets.git] / include / wx / gtk1 / dcclient.h

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 752fd0946249c9e5cc6415c795699625c7381efe..77331532da0b56aed7aef283c1bc059fe882a986 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -35,7 +35,7 @@ public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 

-    ~wxWindowDC();
+    virtual ~wxWindowDC();

 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }


@@ -69,7 +69,7 @@ protected:
 
     virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                         int logical_func = wxCOPY, bool useMask = FALSE );
+                         int logical_func = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );

 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,


@@ -140,7 +140,7 @@ private:
 class wxClientDC : public wxWindowDC
 {
 public:
 class wxClientDC : public wxWindowDC
 {
 public:

-    wxClientDC();
+    wxClientDC() { }

     wxClientDC( wxWindow *win );
 
 protected:
     wxClientDC( wxWindow *win );
 
 protected: