Wine fixes

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

diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index 41bbd504da7cfd35583c9f1dfad16ab985d0143f..ca78d1df80acc4a8074877a5d0df0815a5a55e64 100644 (file)
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -3,19 +3,14 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // 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__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_DCCLIENT_H__
 #define __WX_DCCLIENT_H__
 

-#ifdef __GNUG__
-#pragma interface "dcclient.h"
-#endif
-

 #include "wx/dc.h"
 #include "wx/dc.h"

-#include "wx/window.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -24,17 +19,22 @@
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxClientDC;
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxClientDC;

+class WXDLLEXPORT wxWindowMGL;

 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 

-//FIXME_MGL

 class WXDLLEXPORT wxWindowDC : public wxDC
 {
 public:
     wxWindowDC() {}
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
 public:
     wxWindowDC() {}

-    wxWindowDC( wxWindow *win ) {}
+    virtual ~wxWindowDC();
+    wxWindowDC(wxWindow *win);
+
+protected:
+    wxWindow *m_wnd;
+    bool      m_inPaintHandler;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)


@@ -47,8 +47,8 @@ private:
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:

-    wxClientDC() {}
-    wxClientDC( wxWindow *win ) {}
+    wxClientDC() : wxWindowDC() {}
+    wxClientDC(wxWindow *win);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClientDC)


@@ -61,8 +61,8 @@ private:
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:

-    wxPaintDC() { }
-    wxPaintDC( wxWindow *win ) {}
+    wxPaintDC() : wxClientDC() {}
+    wxPaintDC(wxWindow *win) : wxClientDC(win) {}

 
 private:
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPaintDC)