added wxTextCtrl::HitTest(); implemented it for MSW

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

diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
index 9b650b7d281b96391757a93b0f2db1b293c92496..1bc300e86e099c863829ec78e437275295b9b606 100644 (file)
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@@ -3,14 +3,14 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_DCSCREEN_H__
 #define __WX_DCSCREEN_H__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_DCSCREEN_H__
 #define __WX_DCSCREEN_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dcscreen.h"
 #endif
 
 #pragma interface "dcscreen.h"
 #endif
 


@@ -26,16 +26,15 @@ class WXDLLEXPORT wxScreenDC;
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
 // wxScreenDC
 //-----------------------------------------------------------------------------
 

-//FIXME_MGL
-class WXDLLEXPORT wxScreenDC: public wxPaintDC
+class WXDLLEXPORT wxScreenDC: public wxDC

 {
 public:
 {
 public:

-    wxScreenDC() {}
-    ~wxScreenDC() {}
+    wxScreenDC();
+    ~wxScreenDC();

 
 

-    static bool StartDrawingOnTop( wxWindow *window ) {}
-    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL ) {}
-    static bool EndDrawingOnTop() {}
+    static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
+    static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
+    static bool EndDrawingOnTop() { return TRUE; }

   
 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
   
 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)