changed wxDC::GetTextExtent() and related methods to take const wxFont pointer, for...

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

diff --git a/include/wx/mac/carbon/dcscreen.h b/include/wx/mac/carbon/dcscreen.h
index 53e9c79e67cca555d7758663c0613f577602800c..052f5fb7b857ab1ee4669fbd6ebf8e3b7824dd60 100644 (file)
--- a/include/wx/mac/carbon/dcscreen.h
+++ b/include/wx/mac/carbon/dcscreen.h
@@ -6,16 +6,12 @@
 // 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_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 

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

 #include "wx/dcclient.h"
 
 class WXDLLEXPORT wxScreenDC: public wxWindowDC
 #include "wx/dcclient.h"
 
 class WXDLLEXPORT wxScreenDC: public wxWindowDC


@@ -25,13 +21,17 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC
  public:
   // Create a DC representing the whole screen
   wxScreenDC();
  public:
   // Create a DC representing the whole screen
   wxScreenDC();

-  ~wxScreenDC();
+  virtual ~wxScreenDC();

 
   // Compatibility with X's requirements for
   // drawing on top of all windows
   static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
   static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
   static bool EndDrawingOnTop() { return TRUE; }
 
   // Compatibility with X's requirements for
   // drawing on top of all windows
   static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
   static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
   static bool EndDrawingOnTop() { return TRUE; }

+ private:
+#if wxMAC_USE_CORE_GRAPHICS
+       void* m_overlayWindow;
+#endif

 };
 
 #endif
 };
 
 #endif