Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxDC::GetSize() should work now in wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-10-30 16:46:34 +00:00
parent 376aa62a5d
commit f469b27cac
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/dcclient.cpp
View File

@@ -535,7 +535,7 @@ void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
if (m_pen.GetStyle() != wxTRANSPARENT) if (m_pen.GetStyle() != wxTRANSPARENT)
{ {
gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc ); gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 ); gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
} }
@@ -2224,20 +2224,15 @@ void wxWindowDC::DoDrawSpline( wxList *points )
// wxPaintDC // wxPaintDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC,wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
wxPaintDC::wxPaintDC()
: wxWindowDC()
{
}
wxPaintDC::wxPaintDC( wxWindow *win ) wxPaintDC::wxPaintDC( wxWindow *win )
: wxWindowDC( win ) : wxClientDC( win )
{ {
#if USE_PAINT_REGION #if USE_PAINT_REGION
if (!win->m_clipPaintRegion) if (!win->m_clipPaintRegion)
return; return;
m_paintClippingRegion = win->GetUpdateRegion(); m_paintClippingRegion = win->GetUpdateRegion();
GdkRegion *region = m_paintClippingRegion.GetRegion(); GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region ) if ( region )
@@ -2256,16 +2251,18 @@ wxPaintDC::wxPaintDC( wxWindow *win )
// wxClientDC // wxClientDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
wxClientDC::wxClientDC() wxClientDC::wxClientDC( wxWindow *win )
: wxWindowDC() : wxWindowDC( win )
{ {
} }
wxClientDC::wxClientDC( wxWindow *win ) void wxClientDC::DoGetSize(int *width, int *height) const
: wxWindowDC( win )
{ {
wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
m_owner->GetClientSize( &width, &height );
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

25
src/gtk1/dcclient.cpp
View File

@@ -535,7 +535,7 @@ void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
if (m_pen.GetStyle() != wxTRANSPARENT) if (m_pen.GetStyle() != wxTRANSPARENT)
{ {
gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc ); gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 ); gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
} }
@@ -2224,20 +2224,15 @@ void wxWindowDC::DoDrawSpline( wxList *points )
// wxPaintDC // wxPaintDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC,wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
wxPaintDC::wxPaintDC()
: wxWindowDC()
{
}
wxPaintDC::wxPaintDC( wxWindow *win ) wxPaintDC::wxPaintDC( wxWindow *win )
: wxWindowDC( win ) : wxClientDC( win )
{ {
#if USE_PAINT_REGION #if USE_PAINT_REGION
if (!win->m_clipPaintRegion) if (!win->m_clipPaintRegion)
return; return;
m_paintClippingRegion = win->GetUpdateRegion(); m_paintClippingRegion = win->GetUpdateRegion();
GdkRegion *region = m_paintClippingRegion.GetRegion(); GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region ) if ( region )
@@ -2256,16 +2251,18 @@ wxPaintDC::wxPaintDC( wxWindow *win )
// wxClientDC // wxClientDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
wxClientDC::wxClientDC() wxClientDC::wxClientDC( wxWindow *win )
: wxWindowDC() : wxWindowDC( win )
{ {
} }
wxClientDC::wxClientDC( wxWindow *win ) void wxClientDC::DoGetSize(int *width, int *height) const
: wxWindowDC( win )
{ {
wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
m_owner->GetClientSize( &width, &height );
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------