Fix bug with using invalid date in wxMSW wxCalendarCtrl.

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index da1d79a3f51693946b2953427f60dd89a14953d0..b64f995348c1528566f6c230a687a4f1ed05383f 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.h
+// Name:        wx/gtk/dcclient.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,10 +11,6 @@
 #define _WX_GTKDCCLIENT_H_
 
 #include "wx/gtk/dc.h"
 #define _WX_GTKDCCLIENT_H_
 
 #include "wx/gtk/dc.h"

-#include "wx/dcclient.h"
-#include "wx/region.h"
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxWindowDCImpl
 
 //-----------------------------------------------------------------------------
 // wxWindowDCImpl


@@ -32,7 +28,7 @@ public:
     virtual bool CanGetTextExtent() const { return true; }
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual bool CanGetTextExtent() const { return true; }
 
     virtual void DoGetSize(int *width, int *height) const;

-    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, 
+    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,

                               wxFloodFillStyle style=wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
                               wxFloodFillStyle style=wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 


@@ -58,11 +54,11 @@ public:
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
                                bool useMask = false );
 
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
                                bool useMask = false );
 

-    virtual bool DoBlit( wxCoord xdest, wxCoord ydest, 
+    virtual bool DoBlit( wxCoord xdest, wxCoord ydest,

                          wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
                          wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                         wxRasterOperationMode logical_func = wxCOPY, 
-                         bool useMask = false, 
+                         wxRasterOperationMode logical_func = wxCOPY,
+                         bool useMask = false,

                          wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
                          wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );


@@ -70,9 +66,9 @@ public:
                                    double angle);
     virtual void DoGetTextExtent( const wxString &string,
                                 wxCoord *width, wxCoord *height,
                                    double angle);
     virtual void DoGetTextExtent( const wxString &string,
                                 wxCoord *width, wxCoord *height,

-                                wxCoord *descent = (wxCoord *) NULL,
-                                wxCoord *externalLeading = (wxCoord *) NULL,
-                                const wxFont *theFont = (wxFont *) NULL) const;
+                                wxCoord *descent = NULL,
+                                wxCoord *externalLeading = NULL,
+                                const wxFont *theFont = NULL) const;

     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetDeviceClippingRegion( const wxRegion &region );
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetDeviceClippingRegion( const wxRegion &region );