pragma fix for gcc

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

diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index b9ca10cd5f238bb20d61f0976cdccda06f4be91c..f062e9d5e72110fb77729efe7025e1d2e69f4f14 100644 (file)
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,7 +15,8 @@
 #endif
 
 #include "wx/dc.h"
 #endif
 
 #include "wx/dc.h"

-#include "wx/window.h"
+
+class WXDLLEXPORT wxWindowMGL;

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


@@ -29,12 +30,15 @@ class WXDLLEXPORT wxClientDC;
 // 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;

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


@@ -47,10 +51,11 @@ private:
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:

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

 
 private:
 
 private:

+    wxWindowMGL *m_wnd;

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


@@ -58,6 +63,7 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

+// FIXME_MGL

 class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public: