added wxIconLocation; minor fixes to wxIcon on some platforms

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

diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index f062e9d5e72110fb77729efe7025e1d2e69f4f14..c66fce51417b9efcb338d3b3a6af87aa1143349f 100644 (file)
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -3,7 +3,7 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,8 +16,6 @@
 
 #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)