Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/mac/dcclient.h b/include/wx/mac/dcclient.h
index 29e4e6f7a06c5b50c1b6ae3dd31415874eef2dbc..02407e06023baf1dec88d77b075d0724ded2411b 100644 (file)
--- a/include/wx/mac/dcclient.h
+++ b/include/wx/mac/dcclient.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.h
 // Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.h
 // Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dcclient.h"
 #endif
 
 #pragma interface "dcclient.h"
 #endif
 


@@ -25,100 +25,49 @@
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxWindow;
 

-// Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented differently.
-// On many platforms, however, they will be the same.
-

 class WXDLLEXPORT wxWindowDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxWindowDC)
 

-  public:
-
-    wxWindowDC(void);
-    wxWindowDC( wxWindow *win );
-
-    ~wxWindowDC(void);
-    
-    virtual void FloodFill( long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE );
-    virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
-
-    virtual void DrawLine( long x1, long y1, long x2, long y2 );
-    virtual void CrossHair( long x, long y );
-    virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long 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 DrawPolygon( int n, wxPoint points[], long xoffset = 0, long yoffset = 0, 
-                              int fillStyle=wxODDEVEN_RULE );
-    virtual void DrawPolygon( wxList *lines, long xoffset = 0, long yoffset = 0, 
-                              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 bool CanDrawBitmap(void) const;
-    virtual void DrawIcon( const wxIcon &icon, 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 void GetTextExtent( const wxString &string, long *width, long *height,
-                     long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16 = FALSE );
-    virtual long GetCharWidth(void);
-    virtual long GetCharHeight(void);
-    
-    virtual void Clear(void);
-            
-    virtual void SetFont( const wxFont &font );
-    virtual void SetPen( const wxPen &pen );
-    virtual void SetBrush( const wxBrush &brush );
-    virtual void SetBackground( const wxBrush &brush );
-    virtual void SetLogicalFunction( int function );
-    virtual void SetTextForeground( const wxColour &col );
-    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( const wxRegion& region ) ;
-    virtual void DestroyClippingRegion(void);
-    
-    virtual void DrawSpline( wxList *points );
+ public:
+  wxWindowDC(void);
+
+  // Create a DC corresponding to a canvas
+  wxWindowDC(wxWindow *win);
+
+  ~wxWindowDC(void);
+  virtual void DoGetSize( int *width, int *height ) const;
+  protected :
+    wxWindow     *m_window;

 };
 
 };
 

-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxPaintDC: public wxWindowDC
+class WXDLLEXPORT wxClientDC: public wxWindowDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPaintDC)
+  DECLARE_DYNAMIC_CLASS(wxClientDC)

 
 

-  public:
+ public:
+  wxClientDC(void);

 
 

-    wxPaintDC(void):wxWindowDC() {};
-    wxPaintDC( wxWindow *win ): wxWindowDC(win) {};
+  // Create a DC corresponding to a canvas
+  wxClientDC(wxWindow *win);

 
 

+  ~wxClientDC(void);
+  virtual void DoGetSize( int *width, int *height ) const;

 };
 
 };
 

-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxClientDC: public wxWindowDC
+class WXDLLEXPORT wxPaintDC: public wxWindowDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxClientDC)
+  DECLARE_DYNAMIC_CLASS(wxPaintDC)

 
 

-  public:
+ public:
+  wxPaintDC(void);

 
 

-    wxClientDC(void):wxWindowDC() {};
-    wxClientDC( wxWindow *win ): wxWindowDC(win) {};
+  // Create a DC corresponding to a canvas
+  wxPaintDC(wxWindow *win);

 
 

+  ~wxPaintDC(void);
+  virtual void DoGetSize( int *width, int *height ) const;

 };
 
 #endif
 };
 
 #endif