Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index f320205b8e7f986ffd49991904c9e348dee43579..6b1fc2f2da4e17eaa26fd43b14db31261f2edee2 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -15,42 +15,22 @@
 #include "wx/defs.h"
 #include "wx/dc.h"
 
 #include "wx/defs.h"
 #include "wx/dc.h"
 

-#if wxUSE_NEW_DC
-
-class WXDLLIMPEXP_CORE wxScreenDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxScreenDC : public wxDC

 {
 public:
     wxScreenDC();
 
 {
 public:
     wxScreenDC();
 

+    static bool StartDrawingOnTop(wxWindow * WXUNUSED(window))
+        { return true; }
+    static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) =  NULL)
+        { return true; }
+    static bool EndDrawingOnTop()
+        { return true; }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
 };
 

-#endif
-
-#if defined(__WXPALMOS__)
-#include "wx/palmos/dcscreen.h"
-#elif defined(__WXMSW__)
-#include "wx/msw/dcscreen.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/dcscreen.h"
-#elif defined(__WXGTK20__)
-#include "wx/gtk/dcscreen.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk1/dcscreen.h"
-#elif defined(__WXX11__)
-#include "wx/x11/dcscreen.h"
-#elif defined(__WXMGL__)
-#include "wx/mgl/dcscreen.h"
-#elif defined(__WXDFB__)
-#include "wx/dfb/dcscreen.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/dcscreen.h"
-#elif defined(__WXCOCOA__)
-#include "wx/cocoa/dcscreen.h"
-#elif defined(__WXPM__)
-#include "wx/os2/dcscreen.h"
-#endif

 
 #endif
     // _WX_DCSCREEN_H_BASE_
 
 #endif
     // _WX_DCSCREEN_H_BASE_