X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4bbc9f720cbd99d7092e8944e671a6291068b13..366e420233bc8590ef2fc333ba627267e6b81ca1:/include/wx/mgl/dcclient.h

diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index f062e9d5e7..deb5905bd5 100644
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -3,21 +3,19 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_DCCLIENT_H__
 #define __WX_DCCLIENT_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
 
-class WXDLLEXPORT wxWindowMGL;
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -25,6 +23,7 @@ class WXDLLEXPORT wxWindowMGL;
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxClientDC;
+class WXDLLEXPORT wxWindowMGL;
 
 //-----------------------------------------------------------------------------
 // wxWindowDC
@@ -39,6 +38,7 @@ public:
 
 protected:
     wxWindow *m_wnd;
+    bool      m_inPaintHandler;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
@@ -55,7 +55,6 @@ public:
     wxClientDC(wxWindow *win);
 
 private:
-    wxWindowMGL *m_wnd;
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 
@@ -63,12 +62,11 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-// FIXME_MGL
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
-    wxPaintDC() { }
-    wxPaintDC( wxWindow *win ) {}
+    wxPaintDC() : wxClientDC() {}
+    wxPaintDC(wxWindow *win) : wxClientDC(win) {}
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPaintDC)