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 0ea3c3b126ee19600836579d616686ffbf0a23d3..0c6c3eee387f40cc023e1072e275f9689e17d824 100644 (file)
--- 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);
     // Create a DC corresponding to a window
     wxWindowDC(wxWindow *win);
     ~wxWindowDC(void);

+protected:
+    wxWindow *m_window;

 };
 
 class wxClientDC: public wxWindowDC
 };
 
 class wxClientDC: public wxWindowDC

diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm
index 39e85e4c61e5342b33b4e83eb3230144c65836bf..b1c9429f9a85f2887d8ddebb4030018548704af6 100644 (file)
--- a/src/cocoa/dcclient.mm
+++ b/src/cocoa/dcclient.mm
@@ -21,10 +21,12 @@
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 
 wxWindowDC::wxWindowDC(void)
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 
 wxWindowDC::wxWindowDC(void)

+:   m_window(NULL)

 {
 };
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {
 };
 
 wxWindowDC::wxWindowDC( wxWindow *window )

+:   m_window(window)

 {
     wxFAIL_MSG("non-client window DC's are not supported");
 };
 {
     wxFAIL_MSG("non-client window DC's are not supported");
 };


@@ -43,6 +45,7 @@ wxClientDC::wxClientDC(void)
 };
 
 wxClientDC::wxClientDC( wxWindow *window )
 };
 
 wxClientDC::wxClientDC( wxWindow *window )

+:   wxWindowDC(window)

 {
 };
 
 {
 };
 


@@ -60,6 +63,7 @@ wxPaintDC::wxPaintDC(void)
 };
 
 wxPaintDC::wxPaintDC( wxWindow *window )
 };
 
 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
 {
     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