don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index cc5a8832a9ffd7e5928e7c0b246786695da88557..763ccb830b8c2ee29788160683cbd662a04634a2 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -15,9 +15,7 @@
 #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();
@@ -33,32 +31,6 @@ 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_