Corrected handling of wxTB_HORZ_TEXT in the toolbar sample.

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

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index 3b23ae32046a2a3b41b32ab49b77b09e09c670a7..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$
@@ -7,45 +7,28 @@
 // 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"
 
 //-----------------------------------------------------------------------------
-// classes
+// wxScreenDCImpl
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScreenDC;
-
-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl
 {
 public:
-    wxScreenDC();
-    virtual ~wxScreenDC();
-
-    static bool StartDrawingOnTop( wxWindow *window );
-    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
-    static bool EndDrawingOnTop();
+    wxScreenDCImpl( wxScreenDC *owner );
+    ~wxScreenDCImpl();
 
-    // implementation
-
-    static GdkWindow  *sm_overlayWindow;
-    static int         sm_overlayWindowX;
-    static int         sm_overlayWindowY;
+    virtual void DoGetSize(int *width, int *height) const;
 
 protected:
-    virtual void DoGetSize(int *width, int *height) const;
+    void Init();
 
-private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
 };
 
-#endif
-
-    // __GTKDCSCREENH__
-
+#endif // _WX_GTKDCSCREEN_H_