Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/mac/dcclient.h b/include/wx/mac/dcclient.h
index c7078fe77ec585b8d25607b1d6e50dcaf6005358..8e013140843e76165cd6cc2f03145bf2d7908f6d 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_
 

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

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


@@ -36,6 +36,9 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   wxWindowDC(wxWindow *win);
 
   ~wxWindowDC(void);
   wxWindowDC(wxWindow *win);
 
   ~wxWindowDC(void);

+  virtual void DoGetSize( int *width, int *height ) const;
+  protected :
+    wxWindow     *m_window;

 };
 
 
 };
 
 


@@ -50,6 +53,7 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
   wxClientDC(wxWindow *win);
 
   ~wxClientDC(void);
   wxClientDC(wxWindow *win);
 
   ~wxClientDC(void);

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

 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC


@@ -63,6 +67,7 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   wxPaintDC(wxWindow *win);
 
   ~wxPaintDC(void);
   wxPaintDC(wxWindow *win);
 
   ~wxPaintDC(void);

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

 };
 
 #endif
 };
 
 #endif