Return the old file descriptor/pointer from wx(F)File::Detach().

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

diff --git a/include/wx/dfb/dcclient.h b/include/wx/dfb/dcclient.h
index 6eae9c4aa92000c8afa4a11fdaba11ef03f6eb13..29ed91b2731b0bbc2af0026641096cffaed71bb4 100644 (file)
--- a/include/wx/dfb/dcclient.h
+++ b/include/wx/dfb/dcclient.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dfb/dcclient.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dfb/dcclient.h

-// Purpose:     wxWindowDC, wxClientDC and wxPaintDC
+// Purpose:     wxWindowDCImpl, wxClientDCImpl and wxPaintDCImpl

 // Author:      Vaclav Slavik
 // Created:     2006-08-10
 // Author:      Vaclav Slavik
 // Created:     2006-08-10

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,22 +10,20 @@
 #ifndef _WX_DFB_DCCLIENT_H_
 #define _WX_DFB_DCCLIENT_H_
 
 #ifndef _WX_DFB_DCCLIENT_H_
 #define _WX_DFB_DCCLIENT_H_
 

-#include "wx/dc.h"
+#include "wx/dfb/dc.h"

 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------

-// wxWindowDC
+// wxWindowDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxDFBDCImpl

 {
 public:
 {
 public:

-    wxWindowDC() : m_shouldFlip(false) {}
-    wxWindowDC(wxWindow *win);
-    virtual ~wxWindowDC();
-
-    virtual wxWindow *GetWindow() const { return m_win; }
+    wxWindowDCImpl(wxDC *owner) : wxDFBDCImpl(owner), m_shouldFlip(false) { }
+    wxWindowDCImpl(wxDC *owner, wxWindow *win);
+    virtual ~wxWindowDCImpl();

 
 protected:
     // initializes the DC for painting on given window; if rect!=NULL, then
 
 protected:
     // initializes the DC for painting on given window; if rect!=NULL, then


@@ -34,44 +31,43 @@ protected:
     void InitForWin(wxWindow *win, const wxRect *rect);
 
 private:
     void InitForWin(wxWindow *win, const wxRect *rect);
 
 private:

-    wxWindow *m_win;

     wxRect    m_winRect; // rectangle of the window being painted
 
     bool m_shouldFlip; // flip the surface when done?
 
     friend class wxOverlayImpl; // for m_shouldFlip;
 
     wxRect    m_winRect; // rectangle of the window being painted
 
     bool m_shouldFlip; // flip the surface when done?
 
     friend class wxOverlayImpl; // for m_shouldFlip;
 

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-    DECLARE_NO_COPY_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxClientDC
+// wxClientDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl

 {
 public:
 {
 public:

-    wxClientDC() {}
-    wxClientDC(wxWindow *win);
+    wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
+    wxClientDCImpl(wxDC *owner, wxWindow *win);

 
 

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-    DECLARE_NO_COPY_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);

 };
 
 
 //-----------------------------------------------------------------------------
 };
 
 
 //-----------------------------------------------------------------------------

-// wxPaintDC
+// wxPaintDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl

 {
 public:
 {
 public:

-    wxPaintDC() {}
-    wxPaintDC(wxWindow *win) : wxClientDC(win) {}
+    wxPaintDCImpl(wxDC *owner) : wxClientDCImpl(owner) { }
+    wxPaintDCImpl(wxDC *owner, wxWindow *win) : wxClientDCImpl(owner, win) { }

 
 

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-    DECLARE_NO_COPY_CLASS(wxPaintDC)
+    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);

 };
 
 #endif // _WX_DFB_DCCLIENT_H_
 };
 
 #endif // _WX_DFB_DCCLIENT_H_