No real changes, just add wxSizerItem::AddBorderToSize() helper.

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

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

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,47 +7,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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; }
-
+    virtual void DoGetSize(int *width, int *height) const;

 
 protected:
 
 protected:

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

     void Init();
 
     void Init();
 

-private:
-    DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC)
+    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)

 };
 
 };
 

-#endif
-
-    // __GTKDCSCREENH__
-
+#endif // _WX_GTKDCSCREEN_H_