compilation fixes for wxGTK1 after wxTextEntry changes (unit test still fails, Replac...

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

diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index 0ea3c3b126ee19600836579d616686ffbf0a23d3..9987cc3e5d540c09b08a6d3488e968697be4d998 100644 (file)
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

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


@@ -18,34 +18,53 @@
 // 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.
 // 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 wxWindowDC: public wxDC

 {
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 public:
     wxWindowDC(void);
     // Create a DC corresponding to a window
     wxWindowDC(wxWindow *win);
 {
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 public:
     wxWindowDC(void);
     // Create a DC corresponding to a window
     wxWindowDC(wxWindow *win);

-    ~wxWindowDC(void);
+    virtual ~wxWindowDC(void);
+
+protected:
+    wxWindow *m_window;
+    WX_NSView m_lockedNSView;
+// DC stack
+    virtual bool CocoaLockFocus();
+    virtual bool CocoaUnlockFocus();
+    bool CocoaLockFocusOnNSView(WX_NSView nsview);
+    bool CocoaUnlockFocusOnNSView();
+    virtual bool CocoaGetBounds(void *rectData);

 };
 
 };
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 public:
     wxClientDC(void);
     // Create a DC corresponding to a window
     wxClientDC(wxWindow *win);
 {
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 public:
     wxClientDC(void);
     // Create a DC corresponding to a window
     wxClientDC(wxWindow *win);

-    ~wxClientDC(void);
+    virtual ~wxClientDC(void);
+protected:
+// DC stack
+    virtual bool CocoaLockFocus();
+    virtual bool CocoaUnlockFocus();

 };
 
 };
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
     wxPaintDC(void);
     // Create a DC corresponding to a window
     wxPaintDC(wxWindow *win);
 {
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
     wxPaintDC(void);
     // Create a DC corresponding to a window
     wxPaintDC(wxWindow *win);

-    ~wxPaintDC(void);
+    virtual ~wxPaintDC(void);
+protected:
+// DC stack
+    virtual bool CocoaLockFocus();
+    virtual bool CocoaUnlockFocus();

 };
 
 };
 

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