Added wxDataViewCustomRenderer::RenderText() for renderer simple text in platform...

[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 a7d6b87240126be3d622e254978c293e71cd02f8..b3b42f4e2e2797a2f4013fb32335c7b112c06d42 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -6,24 +6,20 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPaintDC;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {
 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {


@@ -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