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 c2be00de89cfd4c3a49044c04863f4739e41de84..e5c1fea74657f7661d05880bd82d640179ff72d9 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -1,47 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.h
+// Name:        wx/gtk/dcscreen.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// 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"
 
 //-----------------------------------------------------------------------------
-// classes
+// wxScreenDCImpl
 //-----------------------------------------------------------------------------
 
-class wxScreenDC;
-
-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-class wxScreenDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl
 {
-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
-
 public:
-  wxScreenDC(void);
-  ~wxScreenDC(void);
-
-  static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRectangle *rect = (wxRectangle *) NULL );
-  static bool EndDrawingOnTop(void);
-  
-  // implementation
-  
-  static GdkWindow  *sm_overlayWindow;
-  static int         sm_overlayWindowX;
-  static int         sm_overlayWindowY;
-};
+    wxScreenDCImpl( wxScreenDC *owner );
+    ~wxScreenDCImpl();
 
-#endif
+    virtual void DoGetSize(int *width, int *height) const;
 
-    // __GTKDCSCREENH__
+protected:
+    void Init();
+
+    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
+};
 
+#endif // _WX_GTKDCSCREEN_H_