Wine fixes

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

diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index 8e013140843e76165cd6cc2f03145bf2d7908f6d..b743ea79180aeda92c6b903cb1815b7434a8d990 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcclient.h"
-#endif
-

 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------


@@ -35,10 +31,17 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   // Create a DC corresponding to a canvas
   wxWindowDC(wxWindow *win);
 
   // Create a DC corresponding to a canvas
   wxWindowDC(wxWindow *win);
 

-  ~wxWindowDC(void);
-  virtual void DoGetSize( int *width, int *height ) const;
+  virtual ~wxWindowDC(void);
+  wxWindow *GetWindow() const { return m_window; }

   protected :
   protected :

+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; 

     wxWindow     *m_window;
     wxWindow     *m_window;

+#if wxMAC_USE_CORE_GRAPHICS
+       bool            m_release;
+       int                     m_width;
+       int                     m_height;
+#endif

 };
 
 
 };
 
 


@@ -52,8 +55,12 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
   // Create a DC corresponding to a canvas
   wxClientDC(wxWindow *win);
 
   // Create a DC corresponding to a canvas
   wxClientDC(wxWindow *win);
 

-  ~wxClientDC(void);
+  virtual ~wxClientDC(void);
+
+protected:
+#if !wxMAC_USE_CORE_GRAPHICS

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

+#endif

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


@@ -66,8 +73,12 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   // Create a DC corresponding to a canvas
   wxPaintDC(wxWindow *win);
 
   // Create a DC corresponding to a canvas
   wxPaintDC(wxWindow *win);
 

-  ~wxPaintDC(void);
+  virtual ~wxPaintDC(void);
+
+protected:
+#if !wxMAC_USE_CORE_GRAPHICS

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

+#endif

 };
 
 #endif
 };
 
 #endif