tell user to define _USE_OLD_RW_STL for BC5.6 instead of refusing to compile with...

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

diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index 625a16d17984c447ec60781667c7631450b05a4f..d3b9beda71466f71c14f0e4bc369c06066a25211 100644 (file)
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -1,34 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/dcclient.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/dcclient.h

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

 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCCLIENT_H__
 #define __WX_COCOA_DCCLIENT_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCCLIENT_H__
 #define __WX_COCOA_DCCLIENT_H__
 

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

 
 // DFE: A while ago I stumbled upon the fact that retrieving the parent
 // NSView of the content view seems to return the entire window rectangle
 // (including decorations).  Of course, that is not at all part of the
 // Cocoa or OpenStep APIs, but it might be a neat hack.
 
 // DFE: A while ago I stumbled upon the fact that retrieving the parent
 // NSView of the content view seems to return the entire window rectangle
 // (including decorations).  Of course, that is not at all part of the
 // Cocoa or OpenStep APIs, but it might be a neat hack.

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)

 public:
 public:

-    wxWindowDC(void);
+    wxWindowDCImpl(wxDC *owner);

     // Create a DC corresponding to a window
     // Create a DC corresponding to a window

-    wxWindowDC(wxWindow *win);
-    ~wxWindowDC(void);
+    wxWindowDCImpl(wxDC *owner, wxWindow *win);
+    virtual ~wxWindowDCImpl(void);

 
 

-    // NSView specific functions
-    virtual void Clear();

 protected:
     wxWindow *m_window;
     WX_NSView m_lockedNSView;
 protected:
     wxWindow *m_window;
     WX_NSView m_lockedNSView;


@@ -37,34 +35,36 @@ protected:
     virtual bool CocoaUnlockFocus();
     bool CocoaLockFocusOnNSView(WX_NSView nsview);
     bool CocoaUnlockFocusOnNSView();
     virtual bool CocoaUnlockFocus();
     bool CocoaLockFocusOnNSView(WX_NSView nsview);
     bool CocoaUnlockFocusOnNSView();

+    virtual bool CocoaGetBounds(void *rectData);

 };
 
 };
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)

 public:
 public:

-    wxClientDC(void);
+    wxClientDCImpl(wxDC *owner);

     // Create a DC corresponding to a window
     // Create a DC corresponding to a window

-    wxClientDC(wxWindow *win);
-    ~wxClientDC(void);
+    wxClientDCImpl(wxDC *owner, wxWindow *win);
+    virtual ~wxClientDCImpl(void);

 protected:
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
 };
 
 protected:
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
 };
 

-class wxPaintDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)

 public:
 public:

-    wxPaintDC(void);
+    wxPaintDCImpl(wxDC *owner);

     // Create a DC corresponding to a window
     // Create a DC corresponding to a window

-    wxPaintDC(wxWindow *win);
-    ~wxPaintDC(void);
+    wxPaintDCImpl(wxDC *owner, wxWindow *win);
+    virtual ~wxPaintDCImpl(void);

 protected:
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
 };
 
 protected:
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
 };
 

-#endif // __WX_COCOA_DCCLIENT_H__
+#endif
+    // __WX_COCOA_DCCLIENT_H__