Applied FreeBSD patch

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index c39315f143cefee10e3c1df0abe1a3a99a73fb3e..ae99362c136451b900e234da7abb88e4a88d8754 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -35,11 +35,11 @@ class wxWindowDC: public wxDC
   DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
 public:

-  wxWindowDC(void);
+  wxWindowDC();

   wxWindowDC( wxWindow *win );
   wxWindowDC( wxWindow *win );

-    
-  ~wxWindowDC(void);
-    
+
+  ~wxWindowDC();
+

   virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE );
   virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
   virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE );
   virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 


@@ -48,34 +48,34 @@ public:
   virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
   virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
   virtual void DrawPoint( long x, long y );
   virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
   virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
   virtual void DrawPoint( long x, long y );

-    
+

   virtual void DrawLines( int n, wxPoint points[], long xoffset = 0, long yoffset = 0 );
   virtual void DrawLines( wxList *points, long xoffset = 0, long yoffset = 0 );
   virtual void DrawLines( int n, wxPoint points[], long xoffset = 0, long yoffset = 0 );
   virtual void DrawLines( wxList *points, long xoffset = 0, long yoffset = 0 );

-  virtual void DrawPolygon( int n, wxPoint points[], long xoffset = 0, long yoffset = 0, 
+  virtual void DrawPolygon( int n, wxPoint points[], long xoffset = 0, long yoffset = 0,

                             int fillStyle=wxODDEVEN_RULE );
                             int fillStyle=wxODDEVEN_RULE );

-  virtual void DrawPolygon( wxList *lines, long xoffset = 0, long yoffset = 0, 
+  virtual void DrawPolygon( wxList *lines, long xoffset = 0, long yoffset = 0,

                             int fillStyle=wxODDEVEN_RULE );
                             int fillStyle=wxODDEVEN_RULE );

-    
+

   virtual void DrawRectangle( long x, long y, long width, long height );
   virtual void DrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 );
   virtual void DrawEllipse( long x, long y, long width, long height );
   virtual void DrawRectangle( long x, long y, long width, long height );
   virtual void DrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 );
   virtual void DrawEllipse( long x, long y, long width, long height );

-    
-  virtual bool CanDrawBitmap(void) const;
+
+  virtual bool CanDrawBitmap() const;

   virtual void DrawIcon( const wxIcon &icon, long x, long y );
   virtual void DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask=FALSE );
   virtual bool Blit( long xdest, long ydest, long width, long height,
                       wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
 
   virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE );
   virtual void DrawIcon( const wxIcon &icon, long x, long y );
   virtual void DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask=FALSE );
   virtual bool Blit( long xdest, long ydest, long width, long height,
                       wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
 
   virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE );

-  virtual bool CanGetTextExtent(void) const;
+  virtual bool CanGetTextExtent() const;

   virtual void GetTextExtent( const wxString &string, long *width, long *height,
                      long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
                      wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE );
   virtual void GetTextExtent( const wxString &string, long *width, long *height,
                      long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
                      wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE );

-  virtual long GetCharWidth(void);
-  virtual long GetCharHeight(void);
-    
-  virtual void Clear(void);
-            
+  virtual long GetCharWidth();
+  virtual long GetCharHeight();
+
+  virtual void Clear();
+

   virtual void SetFont( const wxFont &font );
   virtual void SetPen( const wxPen &pen );
   virtual void SetBrush( const wxBrush &brush );
   virtual void SetFont( const wxFont &font );
   virtual void SetPen( const wxPen &pen );
   virtual void SetBrush( const wxBrush &brush );


@@ -85,15 +85,18 @@ public:
   virtual void SetTextBackground( const wxColour &col );
   virtual void SetBackgroundMode( int mode );
   virtual void SetPalette( const wxPalette& palette );
   virtual void SetTextBackground( const wxColour &col );
   virtual void SetBackgroundMode( int mode );
   virtual void SetPalette( const wxPalette& palette );

-    
+

   virtual void SetClippingRegion( long x, long y, long width, long height );
   virtual void SetClippingRegion( long x, long y, long width, long height );

-  virtual void DestroyClippingRegion(void);
+  virtual void DestroyClippingRegion();

   virtual void SetClippingRegion( const wxRegion &region  );
   virtual void SetClippingRegion( const wxRegion &region  );

-    
+

   virtual void DrawSpline( wxList *points );
   virtual void DrawSpline( wxList *points );

-    
+
+  // Resolution in pixels per logical inch
+  wxSize GetPPI(void) const;
+

   // implementation
   // implementation

-    
+

   GdkWindow    *m_window;
   GdkGC        *m_penGC;
   GdkGC        *m_brushGC;
   GdkWindow    *m_window;
   GdkGC        *m_penGC;
   GdkGC        *m_brushGC;


@@ -101,10 +104,11 @@ public:
   GdkGC        *m_bgGC;
   GdkColormap  *m_cmap;
   bool          m_isMemDC;
   GdkGC        *m_bgGC;
   GdkColormap  *m_cmap;
   bool          m_isMemDC;

-    
-  void SetUpDC(void);
-  void Destroy(void);
-  GdkWindow *GetWindow(void);
+  wxWindow     *m_owner;
+
+  void SetUpDC();
+  void Destroy();
+  GdkWindow *GetWindow();

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -116,7 +120,7 @@ class wxPaintDC : public wxWindowDC
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 
 public:

-  wxPaintDC(void);
+  wxPaintDC();

   wxPaintDC( wxWindow *win );
 };
 
   wxPaintDC( wxWindow *win );
 };
 


@@ -129,7 +133,7 @@ class wxClientDC : public wxWindowDC
   DECLARE_DYNAMIC_CLASS(wxClientDC)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxClientDC)
 
 public:

-  wxClientDC(void);
+  wxClientDC();

   wxClientDC( wxWindow *win );
 };
 
   wxClientDC( wxWindow *win );
 };