From: David Elliott Date: Wed, 9 Jul 2003 14:56:56 +0000 (+0000) Subject: Store a pointer to the wxWindow in the wxWindowDC class X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fcc9de54786c9a42d20b6e3409083a34b4399f4b Store a pointer to the wxWindow in the wxWindowDC class git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h index 0ea3c3b126..0c6c3eee38 100644 --- a/include/wx/cocoa/dcclient.h +++ b/include/wx/cocoa/dcclient.h @@ -26,6 +26,8 @@ public: // Create a DC corresponding to a window wxWindowDC(wxWindow *win); ~wxWindowDC(void); +protected: + wxWindow *m_window; }; class wxClientDC: public wxWindowDC diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm index 39e85e4c61..b1c9429f9a 100644 --- a/src/cocoa/dcclient.mm +++ b/src/cocoa/dcclient.mm @@ -21,10 +21,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) wxWindowDC::wxWindowDC(void) +: m_window(NULL) { }; wxWindowDC::wxWindowDC( wxWindow *window ) +: m_window(window) { wxFAIL_MSG("non-client window DC's are not supported"); }; @@ -43,6 +45,7 @@ wxClientDC::wxClientDC(void) }; wxClientDC::wxClientDC( wxWindow *window ) +: wxWindowDC(window) { }; @@ -60,6 +63,7 @@ wxPaintDC::wxPaintDC(void) }; wxPaintDC::wxPaintDC( wxWindow *window ) +: wxWindowDC(window) { wxASSERT_MSG([NSView focusView]==window->GetNSView(), "PaintDC's NSView does not have focus. Please use wxPaintDC only as the first DC created in a paint handler"); // This transform flips the graphics since wxDC uses top-left origin