set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index 481c3e672bbd1318431870cdb4da27ba1be77fb9..5bfc6a15e98661ff7d74955d43e358edf2ff0d3c 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
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCCLIENT_H__
@@ -27,10 +27,15 @@ public:
     wxWindowDC(wxWindow *win);
     ~wxWindowDC(void);
 
-    // NSView specific functions
-    virtual void Clear();
 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
@@ -41,6 +46,10 @@ public:
     // Create a DC corresponding to a window
     wxClientDC(wxWindow *win);
     ~wxClientDC(void);
+protected:
+// DC stack
+    virtual bool CocoaLockFocus();
+    virtual bool CocoaUnlockFocus();
 };
 
 class wxPaintDC: public wxWindowDC
@@ -51,6 +60,10 @@ public:
     // Create a DC corresponding to a window
     wxPaintDC(wxWindow *win);
     ~wxPaintDC(void);
+protected:
+// DC stack
+    virtual bool CocoaLockFocus();
+    virtual bool CocoaUnlockFocus();
 };
 
 #endif // __WX_COCOA_DCCLIENT_H__