Fixed bug #1163384. Moved the code that handles activating the cell

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index f46d6364818ca27438e0325e1a3ad2a0b596b110..035e547e2330e5825f6e26cf522745143f1292f5 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
 #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
 


@@ -25,12 +25,15 @@ public:
     wxScreenDC();
 
     // Compatibility with X's requirements for drawing on top of all windows
     wxScreenDC();
 
     // 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(void) { return TRUE; }
+    static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; }
+    static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return true; }
+    static bool EndDrawingOnTop() { return true; }
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)

 };
 
 #endif
 };
 
 #endif