don't do anything in SetWindowMenu() if we're setting the same menu as we already...

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

diff --git a/include/wx/cocoa/dcscreen.h b/include/wx/cocoa/dcscreen.h
index bf04321efdca54df64f632edc700d5640d969c46..cd00c5528eff6a53f37e988fc09737cb158c892d 100644 (file)
--- a/include/wx/cocoa/dcscreen.h
+++ b/include/wx/cocoa/dcscreen.h
@@ -1,26 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/dcscreen.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/dcscreen.h

-// Purpose:     wxScreenDC class
+// Purpose:     wxScreenDCImpl class

 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCSCREEN_H__
 #define __WX_COCOA_DCSCREEN_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCSCREEN_H__
 #define __WX_COCOA_DCSCREEN_H__
 

-#include "wx/dcclient.h"
+#include "wx/dcscreen.h"
+#include "wx/cocoa/dc.h"

 
 

-class WXDLLEXPORT wxScreenDC: public wxDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxCocoaDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)

 public:
 public:

-    wxScreenDC(void);
-    wxScreenDC( wxDC *dc ); // Create compatible DC
-    ~wxScreenDC(void);
+    wxScreenDCImpl(wxScreenDC *owner);
+    wxScreenDCImpl(wxScreenDC *owner, wxDC *dc ); // Create compatible DC
+    virtual ~wxScreenDCImpl(void);
+
+    // Compatibility with X's requirements for drawing on top of all windows
+    static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; }
+    static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return true; }
+    static bool EndDrawingOnTop() { return true; }

 };
 
 #endif // __WX_COCOA_DCSCREEN_H__
 };
 
 #endif // __WX_COCOA_DCSCREEN_H__