projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ShouldOffset is accessed from a different class (in dcgraph.cpp)
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
dcclient.h
diff --git
a/include/wx/cocoa/dcclient.h
b/include/wx/cocoa/dcclient.h
index 0c6c3eee387f40cc023e1072e275f9689e17d824..8808210993afb7fb7f3083e347e2c916b66565f9 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 licens
e
+// Licence:
wxWindows licenc
e
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_DCCLIENT_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_DCCLIENT_H__
@@
-25,9
+25,17
@@
public:
wxWindowDC(void);
// Create a DC corresponding to a window
wxWindowDC(wxWindow *win);
wxWindowDC(void);
// Create a DC corresponding to a window
wxWindowDC(wxWindow *win);
- ~wxWindowDC(void);
+ virtual ~wxWindowDC(void);
+
protected:
wxWindow *m_window;
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 wxClientDC: public wxWindowDC
@@
-37,7
+45,11
@@
public:
wxClientDC(void);
// Create a DC corresponding to a window
wxClientDC(wxWindow *win);
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 wxPaintDC: public wxWindowDC
@@
-47,7
+59,12
@@
public:
wxPaintDC(void);
// Create a DC corresponding to a window
wxPaintDC(wxWindow *win);
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__