// wxWindowDC
//-----------------------------------------------------------------------------
+#if wxUSE_NEW_DC
+IMPLEMENT_DYNAMIC_CLASS(wxGTKWindowImplDC, wxGTKImplDC)
+#else
IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+#endif
-wxWindowDC::wxWindowDC()
+wxGTKWindowImplDC::wxGTKWindowImplDC()
{
m_penGC = (GdkGC *) NULL;
m_brushGC = (GdkGC *) NULL;
m_fontdesc = (PangoFontDescription *)NULL;
}
-wxWindowDC::wxWindowDC( wxWindow *window )
+wxGTKWindowImplDC::wxGTKWindowImplDC( wxWindow *window )
{
wxASSERT_MSG( window, wxT("DC needs a window") );
standard (as e.g. wxStatusBar) */
m_owner = window;
-
+
if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
{
// reverse sense
}
}
-wxWindowDC::~wxWindowDC()
+wxGTKWindowImplDC::~wxGTKWindowImplDC()
{
Destroy();
pango_font_description_free( m_fontdesc );
}
-void wxWindowDC::SetUpDC()
+void wxGTKWindowImplDC::SetUpDC()
{
m_ok = true;
gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
gdk_gc_set_fill( m_textGC, GDK_SOLID );
-
+
gdk_gc_set_colormap( m_textGC, m_cmap );
/* m_penGC */
}
}
-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") );
m_owner->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)
{
+#if wxUSE_IMAGE
+ extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+ const wxColour & col, int style);
+
return wxDoFloodFill(this, 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") );
}
}
-void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::DoCrossHair( wxCoord x, wxCoord y )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
}
}
-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") );
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") );
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") );
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") );
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") );
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") );
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 );
}
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") );
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") );
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 )
{
int w = bitmap.GetWidth();
int h = bitmap.GetHeight();
-
+
if (m_owner && m_owner->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;
}
}
-bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
+bool wxGTKWindowImplDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
xsrc = source->LogicalToDeviceX(xsrc);
ysrc = source->LogicalToDeviceY(ysrc);
+ wxBitmap selected;
wxMemoryDC *memDC = wxDynamicCast(source, wxMemoryDC);
- wxBitmap selected = source->GetSelectedBitmap();
-
+ if ( memDC )
+ {
+ selected = memDC->GetSelectedBitmap();
+ if ( !selected.IsOk() )
+ return false;
+ }
+
bool use_bitmap_method = false;
bool is_mono = false;
ysrcMask = ysrc;
}
- if (memDC && !selected.Ok()) return false;
-
if (selected.Ok())
{
is_mono = (selected.GetDepth() == 1);
GdkWindow* window = source->GetGDKWindow();
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,
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") );
return;
size_t datalen = strlen(data);
- // TODO: as soon as Pango provides a function to check at runtime its
- // version, we can use it to disable the underline hack for
- // Pango >= 1.16 as the "underline of leading/trailing spaces"
- // has been fixed there
- bool needshack = underlined;
+ // 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)
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)
gdk_draw_layout( m_window, m_textGC, x-w, y, m_layout );
// 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;
// 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;
}
-bool wxWindowDC::DoGetPartialTextExtents(const wxString& text,
+bool wxGTKWindowImplDC::DoGetPartialTextExtents(const wxString& text,
wxArrayInt& widths) const
{
const size_t len = text.length();
}
pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
-
+
// Calculate the position of each character based on the widths of
// the previous characters
}
-wxCoord wxWindowDC::GetCharWidth() const
+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") );
#endif // 0/1
}
-void wxWindowDC::SetFont( const wxFont &font )
+void wxGTKWindowImplDC::SetFont( const wxFont &font )
{
m_font = font;
}
}
-void wxWindowDC::SetPen( const wxPen &pen )
+void wxGTKWindowImplDC::SetPen( const wxPen &pen )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
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") );
}
}
-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 */
}
}
-void wxWindowDC::SetLogicalFunction( int function )
+void wxGTKWindowImplDC::SetLogicalFunction( int function )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
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") );
}
}
-void wxWindowDC::SetTextBackground( const wxColour &col )
+void wxGTKWindowImplDC::SetTextBackground( const wxColour &col )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
}
}
-void wxWindowDC::SetBackgroundMode( int mode )
+void wxGTKWindowImplDC::SetBackgroundMode( int mode )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
}
}
-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") );
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") );
gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
}
-void wxWindowDC::DestroyClippingRegion()
+void wxGTKWindowImplDC::DestroyClippingRegion()
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
}
}
-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;
-
+ m_signX = -m_signX;
+
ComputeScaleAndOrigin();
}
-void wxWindowDC::ComputeScaleAndOrigin()
+void wxGTKWindowImplDC::ComputeScaleAndOrigin()
{
const wxRealPoint origScale(m_scaleX, m_scaleY);
}
// 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);
}
// wxPaintDC
//-----------------------------------------------------------------------------
+#if wxUSE_NEW_DC
+IMPLEMENT_DYNAMIC_CLASS(wxGTKPaintImplDC, wxGTKClientImplDC)
+#else
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+#endif
// Limit the paint region to the window size. Sometimes
// the paint region is too big, and this risks X11 errors
}
}
-wxPaintDC::wxPaintDC( wxWindow *win )
- : wxClientDC( win )
+wxGTKPaintImplDC::wxGTKPaintImplDC( wxWindow *win )
+ : wxGTKClientImplDC( win )
{
#if USE_PAINT_REGION
if (!win->m_clipPaintRegion)
// wxClientDC
//-----------------------------------------------------------------------------
+#if wxUSE_NEW_DC
+IMPLEMENT_DYNAMIC_CLASS(wxGTKClientImplDC, wxGTKWindowImplDC)
+#else
IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+#endif
-wxClientDC::wxClientDC( wxWindow *win )
- : wxWindowDC( win )
+wxGTKClientImplDC::wxGTKClientImplDC( wxWindow *win )
+ : wxGTKWindowImplDC( win )
{
- wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
+ wxCHECK_RET( win, _T("NULL window in wxGTKClientImplDC::wxClientDC") );
#ifdef __WXUNIVERSAL__
wxPoint ptOrigin = win->GetClientAreaOrigin();
#endif // __WXUNIVERSAL__
}
-void wxClientDC::DoGetSize(int *width, int *height) const
+void wxGTKClientImplDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
projects / wxWidgets.git / blobdiff