OS/2 fix

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

diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index f062e9d5e72110fb77729efe7025e1d2e69f4f14..deb5905bd5e23d8d8457a04681814da35bd1eb18 100644 (file)
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -3,21 +3,19 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
 
 #pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
 

-class WXDLLEXPORT wxWindowMGL;
-

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


@@ -25,6 +23,7 @@ class WXDLLEXPORT wxWindowMGL;
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxClientDC;
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxPaintDC;
 class WXDLLEXPORT wxClientDC;

+class WXDLLEXPORT wxWindowMGL;

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


@@ -39,6 +38,7 @@ public:
 
 protected:
     wxWindow *m_wnd;
 
 protected:
     wxWindow *m_wnd;

+    bool      m_inPaintHandler;

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


@@ -55,7 +55,6 @@ public:
     wxClientDC(wxWindow *win);
 
 private:
     wxClientDC(wxWindow *win);
 
 private:

-    wxWindowMGL *m_wnd;

     DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 


@@ -63,12 +62,11 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

-// FIXME_MGL

 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)