Added implementation of MDI using top level windows

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index f28ffedd8d82f52c44258e1f7bf375220651fc24..1271d458c39b7c64a7a394087ca3455bd1adaf57 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

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

     #pragma interface "dc.h"
 #endif
 
     #pragma interface "dc.h"
 #endif
 


@@ -135,7 +135,7 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,

                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;


@@ -241,6 +241,7 @@ protected:
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxDC)
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxDC)

+    DECLARE_NO_COPY_CLASS(wxDC)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -253,6 +254,9 @@ class WXDLLEXPORT wxDCTemp : public wxDC
 public:
     wxDCTemp(WXHDC hdc) { SetHDC(hdc); }
     virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); }
 public:
     wxDCTemp(WXHDC hdc) { SetHDC(hdc); }
     virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); }

+
+private:
+    DECLARE_NO_COPY_CLASS(wxDCTemp)

 };
 
 #endif
 };
 
 #endif