Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index 79ed9959a907b048e5786b07b3fd594fba007788..c91926b910bbe0572de8d92eaebbcc819e6f6156 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -1,53 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.h
+// Name:        wx/gtk/dcscreen.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDCSCREENH__
-#define __GTKDCSCREENH__
+#ifndef _WX_GTKDCSCREEN_H_
+#define _WX_GTKDCSCREEN_H_

 
 

-#include "wx/dcclient.h"
+#include "wx/dcscreen.h"
+#include "wx/gtk/dcclient.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxScreenDC
+// wxScreenDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#if wxUSE_NEW_DC
-class WXDLLIMPEXP_CORE wxGTKScreenImplDC : public wxGTKWindowImplDC
-#else
-#define wxGTKScreenImplDC wxScreenDC
-class WXDLLIMPEXP_CORE wxScreenDC : public wxWindowDC
-#endif
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl

 {
 public:
 {
 public:

+    wxScreenDCImpl( wxScreenDC *owner );
+    ~wxScreenDCImpl();

 
 

-#if wxUSE_NEW_DC
-    wxGTKScreenImplDC( wxScreenDC *owner );
-#else
-    wxScreenDC();
-#endif
-
-    ~wxGTKScreenImplDC();
-
-    static bool StartDrawingOnTop( wxWindow *window ) { return true; }
-    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL ) { return true; }
-    static bool EndDrawingOnTop() { return true; }
-
-
-protected:

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

-    
-    void Init();

 
 private:
 
 private:

-    DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC)
-};
-
-#endif
+    void Init();

 
 

-    // __GTKDCSCREENH__
+    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
+};

 
 

+#endif // _WX_GTKDCSCREEN_H_