Allow returning NULL windows from GetCompositeWindowParts().

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

diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index f062e9d5e72110fb77729efe7025e1d2e69f4f14..fafaa01448c2d3d724bbd8e1db7c3db3f65c9761 100644 (file)
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -1,36 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.h
+// Name:        wx/mgl/dcclient.h

 // 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"
 

-class WXDLLEXPORT wxWindowMGL;
-

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

-class WXDLLEXPORT wxWindowDC;
-class WXDLLEXPORT wxPaintDC;
-class WXDLLEXPORT wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowMGL;

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

-class WXDLLEXPORT wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDC : public wxDC

 {
 public:
     wxWindowDC() {}
 {
 public:
     wxWindowDC() {}


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

+    bool      m_inPaintHandler;

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


@@ -48,14 +44,13 @@ private:
 // wxClientDC
 //-----------------------------------------------------------------------------
 
 // wxClientDC
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC

 {
 public:
     wxClientDC() : wxWindowDC() {}
     wxClientDC(wxWindow *win);
 
 private:
 {
 public:
     wxClientDC() : wxWindowDC() {}
     wxClientDC(wxWindow *win);
 
 private:

-    wxWindowMGL *m_wnd;

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


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

-// FIXME_MGL
-class WXDLLEXPORT wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC

 {
 public:
 {
 public:

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

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