Remove "safety margin" from wxControl::Ellipsize().

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

diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h
index d66674a33e8ef7ce9c5421644b42a68c5b15ab58..58fe2381c6efac7c1b60bb6b47d17875459292f8 100644 (file)
--- a/include/wx/motif/dcscreen.h
+++ b/include/wx/motif/dcscreen.h
@@ -1,48 +1,42 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.h
-// Purpose:     wxScreenDC class
+// Name:        wx/motif/dcscreen.h
+// Purpose:     wxScreenDCImpl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "dcscreen.h"
-#endif
+#include "wx/motif/dcclient.h"
 
-#include "wx/dcclient.h"
-
-class WXDLLEXPORT wxScreenDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl
 {
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
-        
 public:
     // Create a DC representing the whole screen
-    wxScreenDC();
-    ~wxScreenDC();
-    
+    wxScreenDCImpl(wxScreenDC *owner);
+    virtual ~wxScreenDCImpl();
+
     // Compatibility with X's requirements for
     // drawing on top of all windows
     static bool StartDrawingOnTop(wxWindow* window);
     static bool StartDrawingOnTop(wxRect* rect = NULL);
     static bool EndDrawingOnTop();
-    
+
 private:
     static WXWindow sm_overlayWindow;
-    
+
     // If we have started transparent drawing at a non-(0,0) point
     // then we will have to adjust the device origin in the
     // constructor.
     static int sm_overlayWindowX;
     static int sm_overlayWindowY;
-};
 
-#endif
-// _WX_DCSCREEN_H_
+    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
+};
 
+#endif // _WX_DCSCREEN_H_