virtual bool Apply( wxGraphicsContext* context );
#ifdef __WXGTK__
- const PangoFontDescription* GetFont() const { return m_font; }
- bool GetUnderlined() const { return m_underlined; }
+ const wxFont& GetFont() const { return m_wxfont; }
#endif
private :
void InitColour(const wxColour& col);
cairo_font_weight_t weight);
double m_size;
- bool m_underlined;
double m_red;
double m_green;
double m_blue;
#ifdef __WXMAC__
cairo_font_face_t *m_font;
#elif defined(__WXGTK__)
- PangoFontDescription* m_font;
+ wxFont m_wxfont;
#endif
// These members are used when the font is created from its face name and
}
wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font,
- const wxColour& col ) : wxGraphicsObjectRefData(renderer)
+ const wxColour& col )
+ : wxGraphicsObjectRefData(renderer)
+#ifdef __WXGTK__
+ , m_wxfont(font)
+#endif
{
InitColour(col);
m_size = font.GetPointSize();
- m_underlined = font.GetUnderlined();
#ifdef __WXMAC__
m_font = cairo_quartz_font_face_create_for_cgfont( font.OSXGetCGFont() );
#elif defined(__WXGTK__)
- m_font = pango_font_description_copy( font.GetNativeFontInfo()->description );
#else
InitFontComponents
(
// directly to cairo_set_font_size().
m_size = sizeInPixels;
-#if defined(__WXGTK__) || defined(__WXMAC__)
+#if defined(__WXMAC__)
m_font = NULL;
#endif
- m_underlined = (flags & wxFONTFLAG_UNDERLINED) != 0;
+ // There is no need to set m_underlined under wxGTK in this case, it can
+ // only be used if m_font != NULL.
InitFontComponents
(
#ifdef __WXMAC__
if ( m_font )
cairo_font_face_destroy( m_font );
-#elif defined(__WXGTK__)
- if ( m_font )
- pango_font_description_free( m_font );
-#else
#endif
}
cairo_t * ctext = (cairo_t*) context->GetNativeContext();
cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
#ifdef __WXGTK__
- if ( m_font )
+ if (m_wxfont.IsOk())
{
// Nothing to do, the caller uses Pango layout functions to do
// everything.
// Create a surface object and copy the bitmap pixel data to it. if the
// image has alpha (or a mask represented as alpha) then we'll use a
// different format and iterator than if it doesn't...
- const cairo_format_t bufferFormat = bmp.GetDepth() == 32
+ cairo_format_t bufferFormat = bmp.GetDepth() == 32
#ifdef __WXGTK__
|| bmp.GetMask()
#endif
int stride = InitBuffer(bmp.GetWidth(), bmp.GetHeight(), bufferFormat);
- int bw = m_width;
- int bh = m_height;
wxBitmap bmpSource = bmp; // we need a non-const instance
wxUint32* data = (wxUint32*)m_buffer;
if ( bufferFormat == CAIRO_FORMAT_ARGB32 )
{
// use the bitmap's alpha
- wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
+ wxAlphaPixelData
+ pixData(bmpSource, wxPoint(0, 0), wxSize(m_width, m_height));
wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
wxAlphaPixelData::Iterator p(pixData);
- for (int y=0; y<bh; y++)
+ for (int y=0; y<m_height; y++)
{
wxAlphaPixelData::Iterator rowStart = p;
wxUint32* const rowStartDst = data;
- for (int x=0; x<bw; x++)
+ for (int x=0; x<m_width; x++)
{
// Each pixel in CAIRO_FORMAT_ARGB32 is a 32-bit quantity,
// with alpha in the upper 8 bits, then red, then green, then
}
else // no alpha
{
- wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
+ wxNativePixelData
+ pixData(bmpSource, wxPoint(0, 0), wxSize(m_width, m_height));
wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
wxNativePixelData::Iterator p(pixData);
- for (int y=0; y<bh; y++)
+ for (int y=0; y<m_height; y++)
{
wxNativePixelData::Iterator rowStart = p;
wxUint32* const rowStartDst = data;
- for (int x=0; x<bw; x++)
+ for (int x=0; x<m_width; x++)
{
// Each pixel in CAIRO_FORMAT_RGB24 is a 32-bit quantity, with
// the upper 8 bits unused. Red, Green, and Blue are stored in
wxBitmap bmpMask = bmpSource.GetMaskBitmap();
bufferFormat = CAIRO_FORMAT_ARGB32;
data = (wxUint32*)m_buffer;
- wxNativePixelData pixData(bmpMask, wxPoint(0,0), wxSize(bw, bh));
- wxCHECK_RET( pixData, wxT("Failed to gain raw access to mask bitmap data."));
+ wxNativePixelData
+ pixData(bmpMask, wxPoint(0, 0), wxSize(m_width, m_height));
+ wxCHECK_RET( pixData, wxT("Failed to gain raw access to mask data."));
wxNativePixelData::Iterator p(pixData);
- for (int y=0; y<bh; y++)
+ for (int y=0; y<m_height; y++)
{
wxNativePixelData::Iterator rowStart = p;
wxUint32* const rowStartDst = data;
- for (int x=0; x<bw; x++)
+ for (int x=0; x<m_width; x++)
{
if (p.Red()+p.Green()+p.Blue() == 0)
*data = 0;
delete [] m_buffer;
}
-// ----------------------------------------------------------------------------
-// wxGraphicsBitmap implementation
-// ----------------------------------------------------------------------------
-
-#if wxUSE_IMAGE
-
-wxImage wxGraphicsBitmap::ConvertToImage() const
-{
- const wxCairoBitmapData* const
- data = static_cast<wxCairoBitmapData*>(GetGraphicsData());
-
- return data ? data->ConvertToImage() : wxNullImage;
-}
-
-#endif // wxUSE_IMAGE
-
//-----------------------------------------------------------------------------
// wxCairoContext implementation
//-----------------------------------------------------------------------------
if ( ((wxCairoFontData*)m_font.GetRefData())->Apply(this) )
{
#ifdef __WXGTK__
- size_t datalen = strlen(data);
-
PangoLayout *layout = pango_cairo_create_layout (m_context);
- wxCairoFontData* font_data = (wxCairoFontData*) m_font.GetRefData();
- pango_layout_set_font_description( layout, font_data->GetFont());
- pango_layout_set_text(layout, data, datalen);
-
- if (font_data->GetUnderlined())
- {
- PangoAttrList *attrs = pango_attr_list_new();
- PangoAttribute *attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
- pango_attr_list_insert(attrs, attr);
- pango_layout_set_attributes(layout, attrs);
- pango_attr_list_unref(attrs);
- }
+ const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
+ pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
+ pango_layout_set_text(layout, data, data.length());
+ font.GTKSetPangoAttrs(layout);
cairo_move_to(m_context, x, y);
pango_cairo_show_layout (m_context, layout);
int w, h;
PangoLayout *layout = pango_cairo_create_layout (m_context);
- pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
+ const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
+ pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
const wxCharBuffer data = str.utf8_str();
if ( !data )
{
return;
}
- pango_layout_set_text( layout, data, strlen(data) );
+ pango_layout_set_text(layout, data, data.length());
pango_layout_get_pixel_size (layout, &w, &h);
if ( width )
*width = w;
virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap );
#if wxUSE_IMAGE
virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image);
+ virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp);
#endif // wxUSE_IMAGE
// create a graphics bitmap from a native bitmap
wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
{
ENSURE_LOADED_OR_RETURN(NULL);
-#ifdef __WXGTK20__
- const wxDCImpl *impl = dc.GetImpl();
- cairo_t* context = (cairo_t*) impl->GetCairoContext();
- if (context)
- return new wxCairoContext(this,dc);
- else
-#endif
- return new wxCairoContext(this,dc);
+ return new wxCairoContext(this, dc);
}
#ifdef __WXMSW__
return bmp;
}
+wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp)
+{
+ ENSURE_LOADED_OR_RETURN(wxNullImage);
+
+ const wxCairoBitmapData* const
+ data = static_cast<wxCairoBitmapData*>(bmp.GetGraphicsData());
+
+ return data ? data->ConvertToImage() : wxNullImage;
+}
+
#endif // wxUSE_IMAGE
+
wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromNativeBitmap( void* bitmap )
{
ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
projects / wxWidgets.git / blobdiff