wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index 16c15281691b2f38143f1be31d1e707d9e9ec04f..67a0cbd95e6203d32f4ac41341060d861653c767 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -5,20 +5,20 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DCSCREENH__
-#define __DCSCREENH__
+#ifndef _WX_DCSCREEN_H_
+#define _WX_DCSCREEN_H_
 
 #ifdef __GNUG__
 #pragma interface "dcscreen.h"
 #endif
 
-#include "wx/dc.h"
+#include "wx/dcclient.h"
 
-class WXDLLEXPORT wxScreenDC: public wxDC
+class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {
   DECLARE_DYNAMIC_CLASS(wxScreenDC)
 
@@ -29,11 +29,11 @@ class WXDLLEXPORT wxScreenDC: public wxDC
 
   // Compatibility with X's requirements for
   // drawing on top of all windows
-  static bool StartDrawingOnTop(wxWindow *window) { return TRUE; }
-  static bool StartDrawingOnTop(wxRectangle *rect = NULL) { return TRUE; }
+  static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
+  static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
   static bool EndDrawingOnTop(void) { return TRUE; }
 };
 
 #endif
-    // __DCSCREENH__
+    // _WX_DCSCREEN_H_