AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DoGetSize implementation corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2003-05-19 18:49:11 +00:00
parent 746d758297
commit 1be0560eff
2 changed files with 76 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/mac/carbon/dcclient.cpp
View File

@ -45,45 +45,51 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
wxWindowDC::wxWindowDC() wxWindowDC::wxWindowDC()
{ {
m_window = NULL ;
} }
wxWindowDC::wxWindowDC(wxWindow *the_canvas) wxWindowDC::wxWindowDC(wxWindow *window)
{ {
wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ; m_window = window ;
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
int x , y ; int x , y ;
x = y = 0 ; x = y = 0 ;
the_canvas->MacWindowToRootWindow( &x , &y ) ; window->MacWindowToRootWindow( &x , &y ) ;
m_macLocalOrigin.x = x ; m_macLocalOrigin.x = x ;
m_macLocalOrigin.y = y ; m_macLocalOrigin.y = y ;
CopyRgn( (RgnHandle) the_canvas->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; CopyRgn( (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_minY = m_minX = 0; m_ok = TRUE ;
wxSize size = the_canvas->GetSize() ; SetBackground(window->MacGetBackgroundBrush());
m_maxX = size.x ;
m_maxY = size.y ;
m_ok = TRUE ;
SetBackground(the_canvas->MacGetBackgroundBrush());
} }
wxWindowDC::~wxWindowDC() wxWindowDC::~wxWindowDC()
{ {
} }
void wxWindowDC::DoGetSize( int* width, int* height ) const
{
wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
m_window->GetSize(width, height);
}
/* /*
* wxClientDC * wxClientDC
*/ */
wxClientDC::wxClientDC() wxClientDC::wxClientDC()
{ {
m_window = NULL ;
} }
wxClientDC::wxClientDC(wxWindow *window) wxClientDC::wxClientDC(wxWindow *window)
{ {
m_window = window ;
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
if (!rootwindow) if (!rootwindow)
return; return;
@ -102,9 +108,7 @@ wxClientDC::wxClientDC(wxWindow *window)
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_minY = m_minX = 0;
m_maxX = size.x ;
m_maxY = size.y ;
m_ok = TRUE ; m_ok = TRUE ;
SetBackground(window->MacGetBackgroundBrush()); SetBackground(window->MacGetBackgroundBrush());
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
@ -114,16 +118,26 @@ wxClientDC::~wxClientDC()
{ {
} }
void wxClientDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
m_window->GetClientSize( width, height );
}
/* /*
* wxPaintDC * wxPaintDC
*/ */
wxPaintDC::wxPaintDC() wxPaintDC::wxPaintDC()
{ {
m_window = NULL ;
} }
wxPaintDC::wxPaintDC(wxWindow *window) wxPaintDC::wxPaintDC(wxWindow *window)
{ {
m_window = window ;
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
wxPoint origin = window->GetClientAreaOrigin() ; wxPoint origin = window->GetClientAreaOrigin() ;
@ -141,9 +155,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_minY = m_minX = 0;
m_maxX = size.x ;
m_maxY = size.y ;
m_ok = TRUE ; m_ok = TRUE ;
SetBackground(window->MacGetBackgroundBrush()); SetBackground(window->MacGetBackgroundBrush());
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
@ -152,3 +164,12 @@ wxPaintDC::wxPaintDC(wxWindow *window)
wxPaintDC::~wxPaintDC() wxPaintDC::~wxPaintDC()
{ {
} }
void wxPaintDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
m_window->GetClientSize( width, height );
}

55
src/mac/dcclient.cpp
View File

@ -45,45 +45,51 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
wxWindowDC::wxWindowDC() wxWindowDC::wxWindowDC()
{ {
m_window = NULL ;
} }
wxWindowDC::wxWindowDC(wxWindow *the_canvas) wxWindowDC::wxWindowDC(wxWindow *window)
{ {
wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ; m_window = window ;
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
int x , y ; int x , y ;
x = y = 0 ; x = y = 0 ;
the_canvas->MacWindowToRootWindow( &x , &y ) ; window->MacWindowToRootWindow( &x , &y ) ;
m_macLocalOrigin.x = x ; m_macLocalOrigin.x = x ;
m_macLocalOrigin.y = y ; m_macLocalOrigin.y = y ;
CopyRgn( (RgnHandle) the_canvas->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; CopyRgn( (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_minY = m_minX = 0; m_ok = TRUE ;
wxSize size = the_canvas->GetSize() ; SetBackground(window->MacGetBackgroundBrush());
m_maxX = size.x ;
m_maxY = size.y ;
m_ok = TRUE ;
SetBackground(the_canvas->MacGetBackgroundBrush());
} }
wxWindowDC::~wxWindowDC() wxWindowDC::~wxWindowDC()
{ {
} }
void wxWindowDC::DoGetSize( int* width, int* height ) const
{
wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
m_window->GetSize(width, height);
}
/* /*
* wxClientDC * wxClientDC
*/ */
wxClientDC::wxClientDC() wxClientDC::wxClientDC()
{ {
m_window = NULL ;
} }
wxClientDC::wxClientDC(wxWindow *window) wxClientDC::wxClientDC(wxWindow *window)
{ {
m_window = window ;
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
if (!rootwindow) if (!rootwindow)
return; return;
@ -102,9 +108,7 @@ wxClientDC::wxClientDC(wxWindow *window)
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_minY = m_minX = 0;
m_maxX = size.x ;
m_maxY = size.y ;
m_ok = TRUE ; m_ok = TRUE ;
SetBackground(window->MacGetBackgroundBrush()); SetBackground(window->MacGetBackgroundBrush());
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
@ -114,16 +118,26 @@ wxClientDC::~wxClientDC()
{ {
} }
void wxClientDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
m_window->GetClientSize( width, height );
}
/* /*
* wxPaintDC * wxPaintDC
*/ */
wxPaintDC::wxPaintDC() wxPaintDC::wxPaintDC()
{ {
m_window = NULL ;
} }
wxPaintDC::wxPaintDC(wxWindow *window) wxPaintDC::wxPaintDC(wxWindow *window)
{ {
m_window = window ;
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
wxPoint origin = window->GetClientAreaOrigin() ; wxPoint origin = window->GetClientAreaOrigin() ;
@ -141,9 +155,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_minY = m_minX = 0;
m_maxX = size.x ;
m_maxY = size.y ;
m_ok = TRUE ; m_ok = TRUE ;
SetBackground(window->MacGetBackgroundBrush()); SetBackground(window->MacGetBackgroundBrush());
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
@ -152,3 +164,12 @@ wxPaintDC::wxPaintDC(wxWindow *window)
wxPaintDC::~wxPaintDC() wxPaintDC::~wxPaintDC()
{ {
} }
void wxPaintDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
m_window->GetClientSize( width, height );
}