// local defines
//-----------------------------------------------------------------------------
+#define XLOG2DEV(x) LogicalToDeviceX(x)
+#define XLOG2DEVREL(x) LogicalToDeviceXRel(x)
+#define YLOG2DEV(y) LogicalToDeviceY(y)
+#define YLOG2DEVREL(y) LogicalToDeviceYRel(y)
+
#define USE_PAINT_REGION 1
//-----------------------------------------------------------------------------
GdkGC *gc,
GdkDrawable *src,
gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height)
+ gint ysrc)
{
wxCHECK_RET( drawable, _T("NULL drawable in gdk_wx_draw_bitmap") );
wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") );
gint src_width, src_height;
gdk_drawable_get_size(src, &src_width, &src_height);
- if (width == -1) width = src_width;
- if (height == -1) height = src_height;
XCopyPlane( GDK_WINDOW_XDISPLAY(drawable),
GDK_WINDOW_XID(src),
GDK_WINDOW_XID(drawable),
GDK_GC_XGC(gc),
xsrc, ysrc,
- width, height,
+ src_width, src_height,
0, 0,
1 );
}
// wxWindowDC
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGTKWindowImplDC, wxGTKImplDC)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxWindowDC, wxDC)
+#endif
+#if wxUSE_NEW_DC
+wxGTKWindowImplDC::wxGTKWindowImplDC( wxDC *owner ) :
+ wxGTKImplDC( owner )
+#else
wxWindowDC::wxWindowDC()
+#endif
{
m_penGC = (GdkGC *) NULL;
m_brushGC = (GdkGC *) NULL;
m_textGC = (GdkGC *) NULL;
m_bgGC = (GdkGC *) NULL;
m_cmap = (GdkColormap *) NULL;
- m_isMemDC = false;
m_isScreenDC = false;
- m_owner = (wxWindow *)NULL;
+ m_owningWindow = (wxWindow *)NULL;
m_context = (PangoContext *)NULL;
m_layout = (PangoLayout *)NULL;
m_fontdesc = (PangoFontDescription *)NULL;
}
+#if wxUSE_NEW_DC
+wxGTKWindowImplDC::wxGTKWindowImplDC( wxDC *owner, wxWindow *window ) :
+ wxGTKImplDC( owner )
+#else
wxWindowDC::wxWindowDC( wxWindow *window )
+#endif
{
wxASSERT_MSG( window, wxT("DC needs a window") );
m_textGC = (GdkGC *) NULL;
m_bgGC = (GdkGC *) NULL;
m_cmap = (GdkColormap *) NULL;
- m_owner = (wxWindow *)NULL;
- m_isMemDC = false;
+ m_owningWindow = (wxWindow *)NULL;
m_isScreenDC = false;
m_font = window->GetFont();
is white whereas a window might assume gray to be the
standard (as e.g. wxStatusBar) */
- m_owner = window;
-
- if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
+ m_owningWindow = window;
+
+ if (m_owningWindow && m_owningWindow->m_wxwindow &&
+ (m_owningWindow->GetLayoutDirection() == wxLayout_RightToLeft))
{
// reverse sense
m_signX = -1;
-
+
// origin in the upper right corner
- wxScrolledWindow *sw = wxDynamicCast( m_owner, wxScrolledWindow );
- if (sw)
- {
- // We cannot use just the virtual size here, because
- // the virtual size may be less than the visible area
- // due to rounding errors of the scroll steps. If the
- // horizontal scroll step is 10 pixels and the virtual
- // area is 97 pixels, we should be able to see or scroll
- // to 100 pixels, so the origin is at -100, not -97.
- if (sw->GetScrollLines(wxHORIZONTAL) == 0)
- {
- int client_width = m_owner->GetClientSize().x;
- m_deviceOriginX = client_width;
- }
- else
- {
- int scroll_step = 0;
- sw->GetScrollPixelsPerUnit( &scroll_step, NULL );
- int client_width = m_owner->GetClientSize().x;
- int virtual_size = sw->GetVirtualSize().x;
- int steps = (virtual_size + scroll_step - 1) / scroll_step;
- int width = steps * scroll_step + (client_width % scroll_step);
- m_deviceOriginX = width;
- }
- }
- else
- {
- int client_width = m_owner->GetClientSize().x;
- m_deviceOriginX = client_width;
- }
+ m_deviceOriginX = m_owningWindow->GetClientSize().x;
}
}
-wxWindowDC::~wxWindowDC()
+wxGTKWindowImplDC::~wxGTKWindowImplDC()
{
Destroy();
pango_font_description_free( m_fontdesc );
}
-void wxWindowDC::SetUpDC()
+void wxGTKWindowImplDC::SetUpDC( bool isMemDC )
{
m_ok = true;
wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
- if (m_isScreenDC)
- {
- m_penGC = wxGetPoolGC( m_window, wxPEN_SCREEN );
- m_brushGC = wxGetPoolGC( m_window, wxBRUSH_SCREEN );
- m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
- m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
- }
- else
- if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1))
+ bool done = false;
+
+ if (isMemDC)
{
- m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );
- m_brushGC = wxGetPoolGC( m_window, wxBRUSH_MONO );
- m_textGC = wxGetPoolGC( m_window, wxTEXT_MONO );
- m_bgGC = wxGetPoolGC( m_window, wxBG_MONO );
+ wxGTKMemoryImplDC *mem_dc = (wxGTKMemoryImplDC*) this;
+ if (mem_dc->GetSelectedBitmap().GetDepth() == 1)
+ {
+ m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );
+ m_brushGC = wxGetPoolGC( m_window, wxBRUSH_MONO );
+ m_textGC = wxGetPoolGC( m_window, wxTEXT_MONO );
+ m_bgGC = wxGetPoolGC( m_window, wxBG_MONO );
+ done = true;
+ }
}
- else
- {
- m_penGC = wxGetPoolGC( m_window, wxPEN_COLOUR );
- m_brushGC = wxGetPoolGC( m_window, wxBRUSH_COLOUR );
- m_textGC = wxGetPoolGC( m_window, wxTEXT_COLOUR );
- m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
+
+ if (!done)
+ {
+ if (m_isScreenDC)
+ {
+ m_penGC = wxGetPoolGC( m_window, wxPEN_SCREEN );
+ m_brushGC = wxGetPoolGC( m_window, wxBRUSH_SCREEN );
+ m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
+ m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
+ }
+ else
+ {
+ m_penGC = wxGetPoolGC( m_window, wxPEN_COLOUR );
+ m_brushGC = wxGetPoolGC( m_window, wxBRUSH_COLOUR );
+ m_textGC = wxGetPoolGC( m_window, wxTEXT_COLOUR );
+ m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
+ }
}
/* background colour */
gdk_gc_set_fill( m_textGC, GDK_SOLID );
+ gdk_gc_set_colormap( m_textGC, m_cmap );
+
/* m_penGC */
m_pen.GetColour().CalcPixel( m_cmap );
gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
}
}
-void wxWindowDC::DoGetSize( int* width, int* height ) const
+void wxGTKWindowImplDC::DoGetSize( int* width, int* height ) const
{
- wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
+ wxCHECK_RET( m_owningWindow, _T("GetSize() doesn't work without window") );
- m_owner->GetSize(width, height);
+ m_owningWindow->GetSize(width, height);
}
-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
- const wxColour & col, int style);
-
-bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+bool wxGTKWindowImplDC::DoFloodFill(wxCoord x, wxCoord y,
const wxColour& col, int style)
{
- return wxDoFloodFill(this, x, y, col, style);
+#if wxUSE_IMAGE
+ extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+ const wxColour & col, int style);
+
+ return wxDoFloodFill( GetOwner(), x, y, col, style);
+#else
+ return false;
+#endif
}
-bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
+bool wxGTKWindowImplDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
{
+#if wxUSE_IMAGE
// Generic (and therefore rather inefficient) method.
// Could be improved.
wxMemoryDC memdc;
wxImage image = bitmap.ConvertToImage();
col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
return true;
+#else // !wxUSE_IMAGE
+ return false;
+#endif // wxUSE_IMAGE/!wxUSE_IMAGE
}
-void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
+void wxGTKWindowImplDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen.GetStyle() != wxTRANSPARENT)
{
}
}
-void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::DoCrossHair( wxCoord x, wxCoord y )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen.GetStyle() != wxTRANSPARENT)
{
int w = 0;
int h = 0;
- GetSize( &w, &h );
+ GetOwner()->GetSize( &w, &h );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
if (m_window)
}
}
-void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+void wxGTKWindowImplDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx1 = XLOG2DEV(x1);
wxCoord yy1 = YLOG2DEV(y1);
{
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, xxc, yyc, xx2, yy2 );
+ if ((m_brush.GetStyle() != wxTRANSPARENT) && (alpha2 - alpha1 != 360*64))
+ {
+ gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+ gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+ }
}
}
CalcBoundingBox (x2, y2);
}
-void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )
+void wxGTKWindowImplDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
CalcBoundingBox (x + width, y + height);
}
-void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::DoDrawPoint( wxCoord x, wxCoord y )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
CalcBoundingBox (x, y);
}
-void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
+void wxGTKWindowImplDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen.GetStyle() == wxTRANSPARENT) return;
if (n <= 0) return;
delete[] gpts;
}
-void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
+void wxGTKWindowImplDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (n <= 0) return;
delete[] gdkpoints;
}
-void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxGTKWindowImplDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
}
if (m_pen.GetStyle() != wxTRANSPARENT)
- gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
+ {
+#if 1
+ if ((m_pen.GetWidth() == 2) && (m_pen.GetCap() == wxCAP_ROUND) &&
+ (m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxSOLID))
+ {
+ // Use 2 1-line rects instead
+ gdk_gc_set_line_attributes( m_penGC, 1, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
+
+ if (m_signX == -1)
+ {
+ // Different for RTL
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx+1, yy, ww-2, hh-2 );
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy-1, ww, hh );
+ }
+ else
+ {
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-2, hh-2 );
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx-1, yy-1, ww, hh );
+ }
+
+ // reset
+ gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
+ }
+ else
+#endif
+ {
+ // Just use X11 for other cases
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
+ }
+ }
}
CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
-void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
+void wxGTKWindowImplDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
// X drawing errors with small radii
if (rr == 0)
{
- DrawRectangle( x, y, width, height );
+ DoDrawRectangle( x, y, width, height );
return;
}
CalcBoundingBox( x + width, y + height );
}
-void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxGTKWindowImplDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
CalcBoundingBox( x + width, y + height );
}
-void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
{
// VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
}
-void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
+void wxGTKWindowImplDC::DoDrawBitmap( const wxBitmap &bitmap,
wxCoord x, wxCoord y,
bool useMask )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
+ wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") );
bool is_mono = bitmap.GetDepth() == 1;
int w = bitmap.GetWidth();
int h = bitmap.GetHeight();
-
- if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
+
+ if (m_owningWindow && m_owningWindow->GetLayoutDirection() == wxLayout_RightToLeft)
xx -= w;
-
+
CalcBoundingBox( x, y );
CalcBoundingBox( x + w, y + h );
if ((w != ww) || (h != hh))
use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
-#if !GTK_CHECK_VERSION(2,2,0)
// NB: We can't render pixbufs with GTK+ < 2.2, we need to use pixmaps code.
// Pixbufs-based bitmaps with alpha channel don't have a mask, so we
// have to call GetPixmap() here -- it converts the pixbuf into pixmap
// and also creates the mask as a side-effect:
- use_bitmap.GetPixmap();
-#endif
+ if (gtk_check_version(2,2,0))
+ use_bitmap.GetPixmap();
// apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL;
GdkGC *gc = gdk_gc_new( bitmap2 );
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
- gdk_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );
+ gdk_wx_draw_bitmap(bitmap2, gc, use_bitmap.GetPixmap(), 0, 0);
gdk_draw_drawable(m_window, use_gc, bitmap2, 0, 0, xx, yy, -1, -1);
}
}
-bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
+bool wxGTKWindowImplDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask )
{
- wxCHECK_MSG( Ok(), false, wxT("invalid window dc") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid window dc") );
wxCHECK_MSG( source, false, wxT("invalid source dc") );
xsrc = source->LogicalToDeviceX(xsrc);
ysrc = source->LogicalToDeviceY(ysrc);
- wxClientDC *srcDC = (wxClientDC*)source;
- wxMemoryDC *memDC = (wxMemoryDC*)source;
+ wxBitmap selected;
+ wxMemoryDC *memDC = wxDynamicCast(source, wxMemoryDC);
+ if ( memDC )
+ {
+ selected = memDC->GetSelectedBitmap();
+ if ( !selected.IsOk() )
+ return false;
+ }
bool use_bitmap_method = false;
bool is_mono = false;
ysrcMask = ysrc;
}
- if (srcDC->m_isMemDC)
+ if (selected.IsOk())
{
- if (!memDC->m_selected.Ok()) return false;
-
- is_mono = (memDC->m_selected.GetDepth() == 1);
+ is_mono = (selected.GetDepth() == 1);
// we use the "XCopyArea" way to copy a memory dc into
// a different window if the memory dc BOTH
// b) it is clipped
// c) is not 1-bit
- if (useMask && (memDC->m_selected.GetMask()))
+ if (useMask && (selected.GetMask()))
{
// we HAVE TO use the direct way for memory dcs
// that have mask since the XCopyArea doesn't know
use_bitmap_method = true;
}
else if ((xsrc == 0) && (ysrc == 0) &&
- (width == memDC->m_selected.GetWidth()) &&
- (height == memDC->m_selected.GetHeight()))
+ (width == selected.GetWidth()) &&
+ (height == selected.GetHeight()))
{
// we SHOULD use the direct way if all of the bitmap
// in the memory dc is copied in which case XCopyArea
if (use_bitmap_method)
{
// scale/translate bitmap size
- wxCoord bm_width = memDC->m_selected.GetWidth();
- wxCoord bm_height = memDC->m_selected.GetHeight();
+ wxCoord bm_width = selected.GetWidth();
+ wxCoord bm_height = selected.GetHeight();
// Get clip coords for the bitmap. If we don't
// use wxBitmap::Rescale(), which can clip the
wxCoord bm_hh = YLOG2DEVREL( bm_height );
// Scale bitmap if required
- wxBitmap use_bitmap = memDC->m_selected;
- if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
+ wxBitmap use_bitmap = selected;
+ if ((selected.GetWidth()!= bm_ww) || ( selected.GetHeight()!= bm_hh))
{
// This indicates that the blitting code below will get
// a clipped bitmap and therefore needs to move the origin
// accordingly
wxRegion tmp( xx,yy,ww,hh );
- tmp.Intersect( m_currentClippingRegion );
+ if (!m_currentClippingRegion.IsNull())
+ tmp.Intersect( m_currentClippingRegion );
tmp.GetBox(cx,cy,cw,ch);
// Scale and clipped bitmap
- use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
+ use_bitmap = selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
}
// apply mask if any
GdkGC *gc = gdk_gc_new( bitmap );
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
- gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );
+ gdk_wx_draw_bitmap(bitmap, gc, use_bitmap.GetPixmap(), 0, 0);
gdk_draw_drawable(m_window, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch);
}
else // use_bitmap_method
{
- if ((width != ww) || (height != hh))
+ if (selected.IsOk() && ((width != ww) || (height != hh)))
{
// get clip coords
wxRegion tmp( xx,yy,ww,hh );
tmp.GetBox(cx,cy,cw,ch);
// rescale bitmap
- wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
+ wxBitmap bitmap = selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
// draw scaled bitmap
// was: gdk_draw_drawable( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
else
{
// No scaling and not a memory dc with a mask either
+#if wxUSE_NEW_DC
+ GdkWindow* window = NULL;
+ wxImplDC *impl = source->GetImpl();
+ wxGTKWindowImplDC *gtk_impl = wxDynamicCast(impl, wxGTKWindowImplDC);
+ if (gtk_impl)
+ window = gtk_impl->GetGDKWindow();
+#else
+ GdkWindow* window = source->GetGDKWindow();
+#endif
+ if ( !window )
+ return false;
// copy including child window contents
gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
gdk_draw_drawable( m_window, m_penGC,
- srcDC->GetWindow(),
+ window,
xsrc, ysrc, xx, yy,
width, height );
gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
return true;
}
-void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (!m_window) return;
wxCHECK_RET( m_layout, wxT("no Pango layout") );
wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
- bool underlined = m_font.Ok() && m_font.GetUnderlined();
+ gdk_pango_context_set_colormap( m_context, m_cmap );
+
+ bool underlined = m_font.IsOk() && m_font.GetUnderlined();
const wxCharBuffer data = wxGTK_CONV( text );
if ( !data )
return;
- const size_t datalen = strlen(data);
- pango_layout_set_text( m_layout, data, datalen);
+ size_t datalen = strlen(data);
+
+ // in Pango >= 1.16 the "underline of leading/trailing spaces" bug
+ // has been fixed and thus the hack implemented below should never be used
+ static bool pangoOk = !wx_pango_version_check(1, 16, 0);
+
+ bool needshack = underlined && !pangoOk;
+ char *hackstring = NULL;
+
+ if (needshack)
+ {
+ // a PangoLayout which has leading/trailing spaces with underlined font
+ // is not correctly drawn by this pango version: Pango won't underline the spaces.
+ // This can be a problem; e.g. wxHTML rendering of underlined text relies on
+ // this behaviour. To workaround this problem, we use a special hack here
+ // suggested by pango maintainer Behdad Esfahbod: we prepend and append two
+ // empty space characters and give them a dummy colour attribute.
+ // This will force Pango to underline the leading/trailing spaces, too.
+
+ // need to realloc the string to prepend & append our special characters
+ hackstring = (char*)malloc((datalen+7)*sizeof(char));
+
+ // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+ strcpy(hackstring, "\342\200\214");
+
+ // copy the user string
+ memcpy(&hackstring[3], data, datalen);
+
+ // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+ strcpy(&hackstring[datalen+3], "\342\200\214");
+
+ // the special characters that we added require 6 additional bytes:
+ datalen += 6;
+
+ pango_layout_set_text(m_layout, hackstring, datalen);
+ }
+ else
+ {
+ pango_layout_set_text(m_layout, data, datalen);
+ }
if (underlined)
{
a->start_index = 0;
a->end_index = datalen;
pango_attr_list_insert(attrs, a);
+
+ if (needshack)
+ {
+ // dummy colour for the leading space
+ a = pango_attr_foreground_new (0x0057, 0x52A9, 0xD614);
+ a->start_index = 0;
+ a->end_index = 1;
+ pango_attr_list_insert(attrs, a);
+
+ // dummy colour for the trailing space
+ a = pango_attr_foreground_new (0x0057, 0x52A9, 0xD614);
+ a->start_index = datalen - 1;
+ a->end_index = datalen;
+ pango_attr_list_insert(attrs, a);
+ }
+
pango_layout_set_attributes(m_layout, attrs);
pango_attr_list_unref(attrs);
}
}
// Draw layout.
- if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
+ if (m_owningWindow && m_owningWindow->GetLayoutDirection() == wxLayout_RightToLeft)
gdk_draw_layout( m_window, m_textGC, x-w, y, m_layout );
else
gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
}
-
+
// Draw layout.
- if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
+ if (m_owningWindow && m_owningWindow->GetLayoutDirection() == wxLayout_RightToLeft)
gdk_draw_layout( m_window, m_textGC, x-w, y, m_layout );
else
gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
height = wxCoord(height / m_scaleY);
CalcBoundingBox (x + width, y + height);
CalcBoundingBox (x, y);
+
+ if (hackstring)
+ free(hackstring);
}
// a better approach here:
// http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
-void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
+void wxGTKWindowImplDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
{
+#if wxUSE_IMAGE
if (!m_window || text.empty())
return;
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if ( wxIsNullDouble(angle) )
{
- DrawText(text, x, y);
+ DoDrawText(text, x, y);
return;
}
wxCoord h;
// TODO: implement later without GdkFont for GTK 2.0
- GetTextExtent(text, &w, &h, NULL,NULL, &m_font);
+ DoGetTextExtent(text, &w, &h, NULL,NULL, &m_font);
// draw the string normally
wxBitmap src(w, h);
// update the bounding box
CalcBoundingBox(x + minX, y + minY);
CalcBoundingBox(x + maxX, y + maxY);
+#endif // wxUSE_IMAGE
}
-void wxWindowDC::DoGetTextExtent(const wxString &string,
+void wxGTKWindowImplDC::DoGetTextExtent(const wxString &string,
wxCoord *width, wxCoord *height,
wxCoord *descent, wxCoord *externalLeading,
- wxFont *theFont) const
+ const wxFont *theFont) const
{
if ( width )
*width = 0;
return;
// ensure that theFont is always non-NULL
- if ( !theFont || !theFont->Ok() )
+ if ( !theFont || !theFont->IsOk() )
theFont = wx_const_cast(wxFont *, &m_font);
// and use it if it's valid
- if ( theFont->Ok() )
+ if ( theFont->IsOk() )
{
pango_layout_set_font_description
(
}
// Reset old font description
- if (theFont)
+ if (theFont->IsOk())
pango_layout_set_font_description( m_layout, m_fontdesc );
}
-wxCoord wxWindowDC::GetCharWidth() const
+
+bool wxGTKWindowImplDC::DoGetPartialTextExtents(const wxString& text,
+ wxArrayInt& widths) const
+{
+ const size_t len = text.length();
+ widths.Empty();
+ widths.Add(0, len);
+
+ if (text.empty())
+ return true;
+
+ // Set layout's text
+ const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(text, m_font);
+ if ( !dataUTF8 )
+ {
+ // hardly ideal, but what else can we do if conversion failed?
+ wxLogLastError(wxT("DoGetPartialTextExtents"));
+ return false;
+ }
+
+ pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+
+ // Calculate the position of each character based on the widths of
+ // the previous characters
+
+ // Code borrowed from Scintilla's PlatGTK
+ PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
+ PangoRectangle pos;
+ pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
+ size_t i = 0;
+ while (pango_layout_iter_next_cluster(iter))
+ {
+ pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
+ int position = PANGO_PIXELS(pos.x);
+ widths[i++] = position;
+ }
+ while (i < len)
+ widths[i++] = PANGO_PIXELS(pos.x + pos.width);
+ pango_layout_iter_free(iter);
+
+ return true;
+}
+
+
+wxCoord wxGTKWindowImplDC::GetCharWidth() const
{
pango_layout_set_text( m_layout, "H", 1 );
int w;
return w;
}
-wxCoord wxWindowDC::GetCharHeight() const
+wxCoord wxGTKWindowImplDC::GetCharHeight() const
{
PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));
- return PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + pango_font_metrics_get_ascent (metrics));
+ wxCHECK_MSG( metrics, -1, _T("failed to get pango font metrics") );
+
+ wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +
+ pango_font_metrics_get_ascent (metrics));
+ pango_font_metrics_unref (metrics);
+ return h;
}
-void wxWindowDC::Clear()
+void wxGTKWindowImplDC::Clear()
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (!m_window) return;
- // VZ: the code below results in infinite recursion and crashes when
- // dc.Clear() is done from OnPaint() so I disable it for now.
- // I don't know what the correct fix is but Clear() surely should not
- // reenter OnPaint()!
-#if 0
- /* - we either are a memory dc or have a window as the
- owner. anything else shouldn't happen.
- - we don't use gdk_window_clear() as we don't set
- the window's background colour anymore. it is too
- much pain to keep the DC's and the window's back-
- ground colour in synch. */
-
- if (m_owner)
- {
- m_owner->Clear();
- return;
- }
-
- if (m_isMemDC)
- {
- int width,height;
- GetSize( &width, &height );
- gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
- return;
- }
-#else // 1
int width,height;
- GetSize( &width, &height );
+ DoGetSize( &width, &height );
gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
-#endif // 0/1
}
-void wxWindowDC::SetFont( const wxFont &font )
+void wxGTKWindowImplDC::SetFont( const wxFont &font )
{
m_font = font;
- if (m_font.Ok())
+ if (m_font.IsOk())
{
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
- if (m_owner)
+ if (m_owningWindow)
{
PangoContext *oldContext = m_context;
- m_context = m_owner->GtkGetPangoDefaultContext();
+ m_context = m_owningWindow->GtkGetPangoDefaultContext();
// If we switch back/forth between different contexts
// we also have to create a new layout. I think so,
}
}
-void wxWindowDC::SetPen( const wxPen &pen )
+void wxGTKWindowImplDC::SetPen( const wxPen &pen )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen == pen) return;
m_pen = pen;
- if (!m_pen.Ok()) return;
+ if (!m_pen.IsOk()) return;
if (!m_window) return;
gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
}
-void wxWindowDC::SetBrush( const wxBrush &brush )
+void wxGTKWindowImplDC::SetBrush( const wxBrush &brush )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_brush == brush) return;
m_brush = brush;
- if (!m_brush.Ok()) return;
+ if (!m_brush.IsOk()) return;
if (!m_window) return;
gdk_gc_set_fill( m_brushGC, GDK_SOLID );
- if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
+ if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->IsOk()))
{
if (m_brush.GetStipple()->GetDepth() != 1)
{
}
}
-void wxWindowDC::SetBackground( const wxBrush &brush )
+void wxGTKWindowImplDC::SetBackground( const wxBrush &brush )
{
/* CMB 21/7/98: Added SetBackground. Sets background brush
* for Clear() and bg colour for shapes filled with cross-hatch brush */
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_backgroundBrush == brush) return;
m_backgroundBrush = brush;
- if (!m_backgroundBrush.Ok()) return;
+ if (!m_backgroundBrush.IsOk()) return;
if (!m_window) return;
gdk_gc_set_fill( m_bgGC, GDK_SOLID );
- if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
+ if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->IsOk()))
{
if (m_backgroundBrush.GetStipple()->GetDepth() != 1)
{
}
}
-void wxWindowDC::SetLogicalFunction( int function )
+void wxGTKWindowImplDC::SetLogicalFunction( int function )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_logicalFunction == function)
return;
gdk_gc_set_function( m_textGC, mode );
}
-void wxWindowDC::SetTextForeground( const wxColour &col )
+void wxGTKWindowImplDC::SetTextForeground( const wxColour &col )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
// don't set m_textForegroundColour to an invalid colour as we'd crash
// later then (we use m_textForegroundColour.GetColor() without checking
// in a few places)
- if ( !col.Ok() || (m_textForegroundColour == col) )
+ if ( !col.IsOk() || (m_textForegroundColour == col) )
return;
m_textForegroundColour = col;
}
}
-void wxWindowDC::SetTextBackground( const wxColour &col )
+void wxGTKWindowImplDC::SetTextBackground( const wxColour &col )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
// same as above
- if ( !col.Ok() || (m_textBackgroundColour == col) )
+ if ( !col.IsOk() || (m_textBackgroundColour == col) )
return;
m_textBackgroundColour = col;
}
}
-void wxWindowDC::SetBackgroundMode( int mode )
+void wxGTKWindowImplDC::SetBackgroundMode( int mode )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
m_backgroundMode = mode;
}
}
-void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+void wxGTKWindowImplDC::SetPalette( const wxPalette& WXUNUSED(palette) )
{
- wxFAIL_MSG( wxT("wxWindowDC::SetPalette not implemented") );
+ wxFAIL_MSG( wxT("wxGTKWindowImplDC::SetPalette not implemented") );
}
-void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxGTKWindowImplDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (!m_window) return;
rect.width = XLOG2DEVREL(width);
rect.height = YLOG2DEVREL(height);
+ if (m_owningWindow && m_owningWindow->m_wxwindow &&
+ (m_owningWindow->GetLayoutDirection() == wxLayout_RightToLeft))
+ {
+ rect.x -= rect.width;
+ }
+
if (!m_currentClippingRegion.IsNull())
m_currentClippingRegion.Intersect( rect );
else
wxCoord xx, yy, ww, hh;
m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+#if wxUSE_NEW_DC
+ wxImplDC::DoSetClippingRegion( xx, yy, ww, hh );
+#else
wxDC::DoSetClippingRegion( xx, yy, ww, hh );
+#endif
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
}
-void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion ®ion )
+void wxGTKWindowImplDC::DoSetClippingRegionAsRegion( const wxRegion ®ion )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (region.Empty())
{
wxCoord xx, yy, ww, hh;
m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+#if wxUSE_NEW_DC
+ wxImplDC::DoSetClippingRegion( xx, yy, ww, hh );
+#else
wxDC::DoSetClippingRegion( xx, yy, ww, hh );
+#endif
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
}
-void wxWindowDC::DestroyClippingRegion()
+void wxGTKWindowImplDC::DestroyClippingRegion()
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+#if wxUSE_NEW_DC
+ wxImplDC::DestroyClippingRegion();
+#else
wxDC::DestroyClippingRegion();
+#endif
m_currentClippingRegion.Clear();
}
}
-void wxWindowDC::Destroy()
+void wxGTKWindowImplDC::Destroy()
{
if (m_penGC) wxFreePoolGC( m_penGC );
m_penGC = (GdkGC*) NULL;
m_bgGC = (GdkGC*) NULL;
}
-void wxWindowDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{
m_deviceOriginX = x;
m_deviceOriginY = y;
-
+
ComputeScaleAndOrigin();
}
-void wxWindowDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+void wxGTKWindowImplDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? -1 : 1);
-
- if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
- m_signX = -m_signX;
-
+
+ if (m_owningWindow && m_owningWindow->m_wxwindow &&
+ (m_owningWindow->GetLayoutDirection() == wxLayout_RightToLeft))
+ m_signX = -m_signX;
+
ComputeScaleAndOrigin();
}
-void wxWindowDC::ComputeScaleAndOrigin()
+void wxGTKWindowImplDC::ComputeScaleAndOrigin()
{
const wxRealPoint origScale(m_scaleX, m_scaleY);
+#if wxUSE_NEW_DC
+ wxImplDC::ComputeScaleAndOrigin();
+#else
wxDC::ComputeScaleAndOrigin();
+#endif
// if scale has changed call SetPen to recalulate the line width
- if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.Ok() )
+ if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
{
// this is a bit artificial, but we need to force wxDC to think the pen
// has changed
}
// Resolution in pixels per logical inch
-wxSize wxWindowDC::GetPPI() const
+wxSize wxGTKWindowImplDC::GetPPI() const
{
return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
}
-int wxWindowDC::GetDepth() const
+int wxGTKWindowImplDC::GetDepth() const
{
return gdk_drawable_get_depth(m_window);
}
+//-----------------------------------------------------------------------------
+// wxClientDC
+//-----------------------------------------------------------------------------
+
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGTKClientImplDC, wxGTKWindowImplDC)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxClientDC, wxWindowDC)
+#endif
+
+#if wxUSE_NEW_DC
+wxGTKClientImplDC::wxGTKClientImplDC( wxDC *owner )
+ : wxGTKWindowImplDC( owner )
+{
+}
+
+wxGTKClientImplDC::wxGTKClientImplDC( wxDC *owner, wxWindow *win )
+ : wxGTKWindowImplDC( owner, win )
+#else
+wxClientDC::wxClientDC()
+{
+}
+
+wxClientDC::wxClientDC( wxWindow *win )
+ : wxWindowDC( win )
+#endif
+
+{
+ wxCHECK_RET( win, _T("NULL window in wxGTKClientImplDC::wxClientDC") );
+
+#ifdef __WXUNIVERSAL__
+ wxPoint ptOrigin = win->GetClientAreaOrigin();
+ SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
+ wxSize size = win->GetClientSize();
+ SetClippingRegion(wxPoint(0, 0), size);
+#endif // __WXUNIVERSAL__
+}
+
+void wxGTKClientImplDC::DoGetSize(int *width, int *height) const
+{
+ wxCHECK_RET( m_owningWindow, _T("GetSize() doesn't work without window") );
+
+ m_owningWindow->GetClientSize( width, height );
+}
+
//-----------------------------------------------------------------------------
// wxPaintDC
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGTKPaintImplDC, wxGTKClientImplDC)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxPaintDC, wxClientDC)
+#endif
// Limit the paint region to the window size. Sometimes
// the paint region is too big, and this risks X11 errors
}
}
+#if wxUSE_NEW_DC
+wxGTKPaintImplDC::wxGTKPaintImplDC( wxDC *owner )
+ : wxGTKClientImplDC( owner )
+{
+}
+
+wxGTKPaintImplDC::wxGTKPaintImplDC( wxDC *owner, wxWindow *win )
+ : wxGTKClientImplDC( owner, win )
+#else
+wxPaintDC::wxPaintDC()
+ : wxClientDC()
+{
+}
+
wxPaintDC::wxPaintDC( wxWindow *win )
: wxClientDC( win )
+#endif
{
#if USE_PAINT_REGION
if (!win->m_clipPaintRegion)
return;
wxSize sz = win->GetSize();
- m_paintClippingRegion = win->GetUpdateRegion();
+ m_paintClippingRegion = win->m_nativeUpdateRegion;
wxLimitRegionToSize(m_paintClippingRegion, sz);
GdkRegion *region = m_paintClippingRegion.GetRegion();
#endif // USE_PAINT_REGION
}
-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
-
-wxClientDC::wxClientDC( wxWindow *win )
- : wxWindowDC( win )
-{
- wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
-
-#ifdef __WXUNIVERSAL__
- wxPoint ptOrigin = win->GetClientAreaOrigin();
- SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
- wxSize size = win->GetClientSize();
- SetClippingRegion(wxPoint(0, 0), size);
-#endif // __WXUNIVERSAL__
-}
-
-void wxClientDC::DoGetSize(int *width, int *height) const
-{
- wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
-
- m_owner->GetClientSize( width, height );
-}
-
// ----------------------------------------------------------------------------
// wxDCModule
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff