#define XCopyPlane XCOPYPLANE
#endif
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+#include "wx/gtk/dcclient.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/log.h"
#include "wx/dcmemory.h"
- #include "wx/math.h" // for floating-point functions
+ #include "wx/math.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/fontutil.h"
-#include "wx/scrolwin.h"
#include "wx/gtk/private.h"
#include "horiz.xbm"
#include "verti.xbm"
#include "cross.xbm"
-#define num_hatches 6
-#define IS_15_PIX_HATCH(s) ((s)==wxCROSSDIAG_HATCH || (s)==wxHORIZONTAL_HATCH || (s)==wxVERTICAL_HATCH)
-#define IS_16_PIX_HATCH(s) ((s)!=wxCROSSDIAG_HATCH && (s)!=wxHORIZONTAL_HATCH && (s)!=wxVERTICAL_HATCH)
-
-
-static GdkPixmap *hatches[num_hatches];
-static GdkPixmap **hatch_bitmap = (GdkPixmap **) NULL;
+static GdkPixmap* hatches[wxBRUSHSTYLE_LAST_HATCH - wxBRUSHSTYLE_FIRST_HATCH + 1];
extern GtkWidget *wxGetRootWindow();
// constants
//-----------------------------------------------------------------------------
-const double RAD2DEG = 180.0 / M_PI;
+static const double RAD2DEG = 180.0 / M_PI;
// ----------------------------------------------------------------------------
// private functions
static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
+static GdkPixmap* GetHatch(int style)
+{
+ wxASSERT(style >= wxBRUSHSTYLE_FIRST_HATCH && style <= wxBRUSHSTYLE_LAST_HATCH);
+ const int i = style - wxBRUSHSTYLE_FIRST_HATCH;
+ if (hatches[i] == NULL)
+ {
+ switch (style)
+ {
+ case wxBRUSHSTYLE_BDIAGONAL_HATCH:
+ hatches[i] = gdk_bitmap_create_from_data(NULL, bdiag_bits, bdiag_width, bdiag_height);
+ break;
+ case wxBRUSHSTYLE_CROSSDIAG_HATCH:
+ hatches[i] = gdk_bitmap_create_from_data(NULL, cdiag_bits, cdiag_width, cdiag_height);
+ break;
+ case wxBRUSHSTYLE_CROSS_HATCH:
+ hatches[i] = gdk_bitmap_create_from_data(NULL, cross_bits, cross_width, cross_height);
+ break;
+ case wxBRUSHSTYLE_FDIAGONAL_HATCH:
+ hatches[i] = gdk_bitmap_create_from_data(NULL, fdiag_bits, fdiag_width, fdiag_height);
+ break;
+ case wxBRUSHSTYLE_HORIZONTAL_HATCH:
+ hatches[i] = gdk_bitmap_create_from_data(NULL, horiz_bits, horiz_width, horiz_height);
+ break;
+ case wxBRUSHSTYLE_VERTICAL_HATCH:
+ hatches[i] = gdk_bitmap_create_from_data(NULL, verti_bits, verti_width, verti_height);
+ break;
+ }
+ }
+ return hatches[i];
+}
+
//-----------------------------------------------------------------------------
// temporary implementation of the missing GDK function
//-----------------------------------------------------------------------------
-#include "gdk/gdkprivate.h"
-
static
void gdk_wx_draw_bitmap(GdkDrawable *drawable,
GdkGC *gc,
gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) NULL );
-
- if (!hatch_bitmap)
- {
- hatch_bitmap = hatches;
- hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
- hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
- hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
- hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
- hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
- hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
- }
}
void wxWindowDCImpl::DoGetSize( int* width, int* height ) const
{
wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
if (m_gdkwindow)
gdk_draw_line( m_gdkwindow, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );
{
wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
int w = 0;
int h = 0;
}
}
+void wxWindowDCImpl::DrawingSetup(GdkGC*& gc, bool& originChanged)
+{
+ gc = m_brushGC;
+ GdkPixmap* pixmap = NULL;
+ const int style = m_brush.GetStyle();
+
+ if (style == wxBRUSHSTYLE_STIPPLE || style == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE)
+ {
+ const wxBitmap* stipple = m_brush.GetStipple();
+ if (stipple->IsOk())
+ {
+ if (style == wxBRUSHSTYLE_STIPPLE)
+ pixmap = stipple->GetPixmap();
+ else if (stipple->GetMask())
+ {
+ pixmap = stipple->GetPixmap();
+ gc = m_textGC;
+ }
+ }
+ }
+ else if (m_brush.IsHatch())
+ {
+ pixmap = GetHatch(style);
+ }
+
+ int origin_x = 0;
+ int origin_y = 0;
+ if (pixmap)
+ {
+ int w, h;
+ gdk_drawable_get_size(pixmap, &w, &h);
+ origin_x = m_deviceOriginX % w;
+ origin_y = m_deviceOriginY % h;
+ }
+
+ originChanged = origin_x || origin_y;
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, origin_x, origin_y);
+}
+
void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc )
{
if (m_gdkwindow)
{
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_gc_set_ts_origin( m_textGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- gdk_gc_set_ts_origin( m_textGC, 0, 0 );
- } else
- if (IS_15_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (IS_16_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (m_brush.GetStyle() == wxSTIPPLE)
- {
- gdk_gc_set_ts_origin( m_brushGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- }
- else
- {
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- }
+ GdkGC* gc;
+ bool originChanged;
+ DrawingSetup(gc, originChanged);
+
+ gdk_draw_arc(m_gdkwindow, gc, true, xxc-r, yyc-r, 2*r, 2*r, alpha1, alpha2);
+
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, 0, 0);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- if ((m_brush.GetStyle() != wxTRANSPARENT) && (alpha2 - alpha1 != 360*64))
+ if ((m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT) && (alpha2 - alpha1 != 360*64))
{
gdk_draw_line( m_gdkwindow, m_penGC, xx1, yy1, xxc, yyc );
gdk_draw_line( m_gdkwindow, m_penGC, xxc, yyc, xx2, yy2 );
wxCoord start = wxCoord(sa * 64.0);
wxCoord end = wxCoord((ea-sa) * 64.0);
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_gc_set_ts_origin( m_textGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx, yy, ww, hh, start, end );
- gdk_gc_set_ts_origin( m_textGC, 0, 0 );
- } else
- if (IS_15_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (IS_16_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (m_brush.GetStyle() == wxSTIPPLE)
- {
- gdk_gc_set_ts_origin( m_brushGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- }
- else
- {
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
- }
+ GdkGC* gc;
+ bool originChanged;
+ DrawingSetup(gc, originChanged);
+
+ gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, start, end);
+
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, 0, 0);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, start, end );
}
{
wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- if ((m_pen.GetStyle() != wxTRANSPARENT) && m_gdkwindow)
+ if ((m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT) && m_gdkwindow)
gdk_draw_point( m_gdkwindow, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
CalcBoundingBox (x, y);
{
wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
if (n <= 0) return;
//Check, if scaling is necessary
if (m_gdkwindow)
{
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_gc_set_ts_origin( m_textGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_polygon( m_gdkwindow, m_textGC, TRUE, gdkpoints, n );
- gdk_gc_set_ts_origin( m_textGC, 0, 0 );
- } else
- if (IS_15_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
- gdk_draw_polygon( m_gdkwindow, m_brushGC, TRUE, gdkpoints, n );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (IS_16_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
- gdk_draw_polygon( m_gdkwindow, m_brushGC, TRUE, gdkpoints, n );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (m_brush.GetStyle() == wxSTIPPLE)
- {
- gdk_gc_set_ts_origin( m_brushGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_polygon( m_gdkwindow, m_brushGC, TRUE, gdkpoints, n );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- }
- else
- {
- gdk_draw_polygon( m_gdkwindow, m_brushGC, TRUE, gdkpoints, n );
- }
+ GdkGC* gc;
+ bool originChanged;
+ DrawingSetup(gc, originChanged);
+
+ gdk_draw_polygon(m_gdkwindow, gc, true, gdkpoints, n);
+
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, 0, 0);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
/*
for (i = 0 ; i < n ; i++)
if (m_gdkwindow)
{
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_gc_set_ts_origin( m_textGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_rectangle( m_gdkwindow, m_textGC, TRUE, xx, yy, ww, hh );
- gdk_gc_set_ts_origin( m_textGC, 0, 0 );
- } else
- if (IS_15_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (IS_16_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (m_brush.GetStyle() == wxSTIPPLE)
- {
- gdk_gc_set_ts_origin( m_brushGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- }
- else
- {
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh );
- }
+ GdkGC* gc;
+ bool originChanged;
+ DrawingSetup(gc, originChanged);
+
+ gdk_draw_rectangle(m_gdkwindow, gc, true, xx, yy, ww, hh);
+
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, 0, 0);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
#if 1
if ((m_pen.GetWidth() == 2) && (m_pen.GetCap() == wxCAP_ROUND) &&
- (m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxSOLID))
+ (m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxPENSTYLE_SOLID))
{
// Use 2 1-line rects instead
gdk_gc_set_line_attributes( m_penGC, 1, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
// CMB: adjust size if outline is drawn otherwise the result is
// 1 pixel too wide and high
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
ww--;
hh--;
if (dd > hh) dd = hh;
rr = dd / 2;
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_gc_set_ts_origin( m_textGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_rectangle( m_gdkwindow, m_textGC, TRUE, xx+rr, yy, ww-dd+1, hh );
- gdk_draw_rectangle( m_gdkwindow, m_textGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
- gdk_gc_set_ts_origin( m_textGC, 0, 0 );
- } else
- if (IS_15_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (IS_16_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (m_brush.GetStyle() == wxSTIPPLE)
- {
- gdk_gc_set_ts_origin( m_brushGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- }
- else
- {
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
- gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
- }
+ GdkGC* gc;
+ bool originChanged;
+ DrawingSetup(gc, originChanged);
+
+ gdk_draw_rectangle(m_gdkwindow, gc, true, xx+rr, yy, ww-dd+1, hh);
+ gdk_draw_rectangle(m_gdkwindow, gc, true, xx, yy+rr, ww, hh-dd+1);
+ gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, dd, dd, 90*64, 90*64);
+ gdk_draw_arc(m_gdkwindow, gc, true, xx+ww-dd, yy, dd, dd, 0, 90*64);
+ gdk_draw_arc(m_gdkwindow, gc, true, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64);
+ gdk_draw_arc(m_gdkwindow, gc, true, xx, yy+hh-dd, dd, dd, 180*64, 90*64);
+
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, 0, 0);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy, xx+ww-rr, yy );
gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy+hh, xx+ww-rr, yy+hh );
if (m_gdkwindow)
{
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_gc_set_ts_origin( m_textGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
- gdk_gc_set_ts_origin( m_textGC, 0, 0 );
- } else
- if (IS_15_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (IS_16_PIX_HATCH(m_brush.GetStyle()))
- {
- gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- } else
- if (m_brush.GetStyle() == wxSTIPPLE)
- {
- gdk_gc_set_ts_origin( m_brushGC,
- m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
- m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
- gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
- }
- else
- {
- gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
- }
+ GdkGC* gc;
+ bool originChanged;
+ DrawingSetup(gc, originChanged);
+
+ gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, 0, 360*64);
+
+ if (originChanged)
+ gdk_gc_set_ts_origin(gc, 0, 0);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 );
}
else
{
// No scaling and not a memory dc with a mask either
-#if wxUSE_NEW_DC
GdkWindow* window = NULL;
wxDCImpl *impl = source->GetImpl();
wxWindowDCImpl *gtk_impl = wxDynamicCast(impl, wxWindowDCImpl);
if (gtk_impl)
window = gtk_impl->GetGDKWindow();
-#else
- GdkWindow* window = source->GetGDKWindow();
-#endif
if ( !window )
+ {
+ SetLogicalFunction( old_logical_func );
return false;
+ }
// copy including child window contents
gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
bool underlined = m_font.IsOk() && m_font.GetUnderlined();
- const wxCharBuffer data = wxGTK_CONV( text );
+ wxCharBuffer data = wxGTK_CONV(text);
if ( !data )
return;
size_t datalen = strlen(data);
static bool pangoOk = !wx_pango_version_check(1, 16, 0);
bool needshack = underlined && !pangoOk;
- char *hackstring = NULL;
if (needshack)
{
// 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));
-
+ wxCharBuffer data_tmp(datalen + 6);
// copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
- strcpy(hackstring, "\342\200\214");
-
+ memcpy(data_tmp.data(), "\342\200\214", 3);
// copy the user string
- memcpy(&hackstring[3], data, datalen);
-
+ memcpy(data_tmp.data() + 3, data, datalen);
// copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
- strcpy(&hackstring[datalen+3], "\342\200\214");
+ memcpy(data_tmp.data() + 3 + datalen, "\342\200\214", 3);
- // the special characters that we added require 6 additional bytes:
+ data = data_tmp;
datalen += 6;
-
- pango_layout_set_text(m_layout, hackstring, datalen);
- }
- else
- {
- pango_layout_set_text(m_layout, data, datalen);
}
+ pango_layout_set_text(m_layout, data, datalen);
+
if (underlined)
{
PangoAttrList *attrs = pango_attr_list_new();
pango_attr_list_unref(attrs);
}
- int w,h;
-
- if (fabs(m_scaleY - 1.0) > 0.00001)
+ int oldSize = 0;
+ const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001;
+ if (isScaled)
{
// If there is a user or actually any scale applied to
// the device context, scale the font.
// scale font description
- gint oldSize = pango_font_description_get_size( m_fontdesc );
- double size = oldSize;
- size = size * m_scaleY;
- pango_font_description_set_size( m_fontdesc, (gint)size );
+ oldSize = pango_font_description_get_size(m_fontdesc);
+ pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY));
// actually apply scaled font
pango_layout_set_font_description( m_layout, m_fontdesc );
+ }
- pango_layout_get_pixel_size( m_layout, &w, &h );
- if ( m_backgroundMode == wxSOLID )
- {
- gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
- gdk_draw_rectangle(m_gdkwindow, m_textGC, TRUE, x, y, w, h);
- gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
- }
+ int w, h;
+ pango_layout_get_pixel_size(m_layout, &w, &h);
+ if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
+ {
+ gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
+ gdk_draw_rectangle(m_gdkwindow, m_textGC, true, x, y, w, h);
+ gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
+ }
- // Draw layout.
- if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
- gdk_draw_layout( m_gdkwindow, m_textGC, x-w, y, m_layout );
- else
- gdk_draw_layout( m_gdkwindow, m_textGC, x, y, m_layout );
+ // Draw layout.
+ int x_rtl = x;
+ if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
+ x_rtl -= w;
+ gdk_draw_layout(m_gdkwindow, m_textGC, x_rtl, y, m_layout);
+ if (isScaled)
+ {
// reset unscaled size
pango_font_description_set_size( m_fontdesc, oldSize );
// actually apply unscaled font
pango_layout_set_font_description( m_layout, m_fontdesc );
}
- else
- {
- pango_layout_get_pixel_size( m_layout, &w, &h );
- if ( m_backgroundMode == wxSOLID )
- {
- gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
- gdk_draw_rectangle(m_gdkwindow, m_textGC, TRUE, x, y, w, h);
- gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
- }
-
- // Draw layout.
- if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
- gdk_draw_layout( m_gdkwindow, m_textGC, x-w, y, m_layout );
- else
- gdk_draw_layout( m_gdkwindow, m_textGC, x, y, m_layout );
- }
-
if (underlined)
{
// undo underline attributes setting:
pango_layout_set_attributes(m_layout, NULL);
}
- wxCoord width = w;
- wxCoord height = h;
-
- width = wxCoord(width / m_scaleX);
- height = wxCoord(height / m_scaleY);
- CalcBoundingBox (x + width, y + height);
- CalcBoundingBox (x, y);
-
- if (hackstring)
- free(hackstring);
+ CalcBoundingBox(x + int(w / m_scaleX), y + int(h / m_scaleY));
+ CalcBoundingBox(x, y);
}
// ensure that theFont is always non-NULL
if ( !theFont || !theFont->IsOk() )
- theFont = wx_const_cast(wxFont *, &m_font);
+ theFont = &m_font;
// and use it if it's valid
if ( theFont->IsOk() )
return;
}
- pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+ pango_layout_set_text(m_layout, dataUTF8, -1);
+ int h;
+ pango_layout_get_pixel_size(m_layout, width, &h);
if (descent)
{
- int h;
- pango_layout_get_pixel_size( m_layout, width, &h );
PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
*descent = h - PANGO_PIXELS(baseline);
-
- if (height)
- *height = (wxCoord) h;
- }
- else
- {
- pango_layout_get_pixel_size( m_layout, width, height );
}
+ if (height)
+ *height = h;
// Reset old font description
if (theFont->IsOk())
return false;
}
- pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+ pango_layout_set_text(m_layout, dataUTF8, -1);
// Calculate the position of each character based on the widths of
// the previous characters
int req_nb_dash;
const wxGTKDash *req_dash;
- GdkLineStyle lineStyle = GDK_LINE_SOLID;
+ GdkLineStyle lineStyle = GDK_LINE_ON_OFF_DASH;
switch (m_pen.GetStyle())
{
- case wxUSER_DASH:
- {
- lineStyle = GDK_LINE_ON_OFF_DASH;
+ case wxPENSTYLE_USER_DASH:
req_nb_dash = m_pen.GetDashCount();
req_dash = (wxGTKDash*)m_pen.GetDash();
break;
- }
- case wxDOT:
- {
- lineStyle = GDK_LINE_ON_OFF_DASH;
+ case wxPENSTYLE_DOT:
req_nb_dash = 2;
req_dash = dotted;
break;
- }
- case wxLONG_DASH:
- {
- lineStyle = GDK_LINE_ON_OFF_DASH;
+ case wxPENSTYLE_LONG_DASH:
req_nb_dash = 2;
req_dash = wxCoord_dashed;
break;
- }
- case wxSHORT_DASH:
- {
- lineStyle = GDK_LINE_ON_OFF_DASH;
+ case wxPENSTYLE_SHORT_DASH:
req_nb_dash = 2;
req_dash = short_dashed;
break;
- }
- case wxDOT_DASH:
- {
-// lineStyle = GDK_LINE_DOUBLE_DASH;
- lineStyle = GDK_LINE_ON_OFF_DASH;
+ case wxPENSTYLE_DOT_DASH:
req_nb_dash = 4;
req_dash = dotted_dashed;
break;
- }
- case wxTRANSPARENT:
- case wxSTIPPLE_MASK_OPAQUE:
- case wxSTIPPLE:
- case wxSOLID:
+ case wxPENSTYLE_TRANSPARENT:
+ case wxPENSTYLE_STIPPLE_MASK_OPAQUE:
+ case wxPENSTYLE_STIPPLE:
+ case wxPENSTYLE_SOLID:
default:
- {
lineStyle = GDK_LINE_SOLID;
req_dash = (wxGTKDash*)NULL;
req_nb_dash = 0;
break;
- }
}
if (req_dash && req_nb_dash)
case wxCAP_BUTT: { capStyle = GDK_CAP_BUTT; break; }
case wxCAP_ROUND:
default:
- {
if (width <= 1)
{
width = 0;
capStyle = GDK_CAP_NOT_LAST;
}
- else
- {
- capStyle = GDK_CAP_ROUND;
- }
break;
- }
}
GdkJoinStyle joinStyle = GDK_JOIN_ROUND;
gdk_gc_set_fill( m_brushGC, GDK_SOLID );
- if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->IsOk()))
+ if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE) && (m_brush.GetStipple()->IsOk()))
{
if (m_brush.GetStipple()->GetDepth() != 1)
{
}
}
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+ if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
{
gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
if (m_brush.IsHatch())
{
gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
- int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
- gdk_gc_set_stipple( m_brushGC, hatches[num] );
+ gdk_gc_set_stipple(m_brushGC, GetHatch(m_brush.GetStyle()));
}
}
if (!m_gdkwindow) return;
- m_backgroundBrush.GetColour().CalcPixel( m_cmap );
- gdk_gc_set_background( m_brushGC, m_backgroundBrush.GetColour().GetColor() );
- gdk_gc_set_background( m_penGC, m_backgroundBrush.GetColour().GetColor() );
- gdk_gc_set_background( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
- gdk_gc_set_foreground( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
+ wxColor color = m_backgroundBrush.GetColour();
+ color.CalcPixel(m_cmap);
+ const GdkColor* gdkColor = color.GetColor();
+ gdk_gc_set_background(m_brushGC, gdkColor);
+ gdk_gc_set_background(m_penGC, gdkColor);
+ gdk_gc_set_background(m_bgGC, gdkColor);
+ gdk_gc_set_foreground(m_bgGC, gdkColor);
+
gdk_gc_set_fill( m_bgGC, GDK_SOLID );
- if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->IsOk()))
+ if (m_backgroundBrush.GetStyle() == wxBRUSHSTYLE_STIPPLE)
{
- if (m_backgroundBrush.GetStipple()->GetDepth() != 1)
- {
- gdk_gc_set_fill( m_bgGC, GDK_TILED );
- gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
- }
- else
+ const wxBitmap* stipple = m_backgroundBrush.GetStipple();
+ if (stipple->IsOk())
{
- gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
- gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
+ if (stipple->GetDepth() != 1)
+ {
+ gdk_gc_set_fill(m_bgGC, GDK_TILED);
+ gdk_gc_set_tile(m_bgGC, stipple->GetPixmap());
+ }
+ else
+ {
+ gdk_gc_set_fill(m_bgGC, GDK_STIPPLED);
+ gdk_gc_set_stipple(m_bgGC, stipple->GetPixmap());
+ }
}
}
-
- if (m_backgroundBrush.IsHatch())
+ else if (m_backgroundBrush.IsHatch())
{
gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
- int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
- gdk_gc_set_stipple( m_bgGC, hatches[num] );
+ gdk_gc_set_stipple(m_bgGC, GetHatch(m_backgroundBrush.GetStyle()));
}
}
// CMB 21/7/98: fill style of cross-hatch brushes is affected by
// transparent/solid background mode
- if (m_brush.GetStyle() != wxSOLID && m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_SOLID && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
gdk_gc_set_fill( m_brushGC,
- (m_backgroundMode == wxTRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
+ (m_backgroundMode == wxBRUSHSTYLE_TRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
}
}
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_textGC, m_currentClippingRegion.GetRegion() );
- gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
+ GdkRegion* gdkRegion = m_currentClippingRegion.GetRegion();
+ gdk_gc_set_clip_region(m_penGC, gdkRegion);
+ gdk_gc_set_clip_region(m_brushGC, gdkRegion);
+ gdk_gc_set_clip_region(m_textGC, gdkRegion);
+ gdk_gc_set_clip_region(m_bgGC, gdkRegion);
}
void wxWindowDCImpl::DoSetClippingRegionAsRegion( const wxRegion ®ion )
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_textGC, m_currentClippingRegion.GetRegion() );
- gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
+ GdkRegion* gdkRegion = m_currentClippingRegion.GetRegion();
+ gdk_gc_set_clip_region(m_penGC, gdkRegion);
+ gdk_gc_set_clip_region(m_brushGC, gdkRegion);
+ gdk_gc_set_clip_region(m_textGC, gdkRegion);
+ gdk_gc_set_clip_region(m_bgGC, gdkRegion);
}
void wxWindowDCImpl::DestroyClippingRegion()
if (!m_gdkwindow) return;
- if (m_currentClippingRegion.IsEmpty())
- {
- gdk_gc_set_clip_rectangle( m_penGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) NULL );
- }
- else
- {
- 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_textGC, m_currentClippingRegion.GetRegion() );
- gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
- }
+ GdkRegion* gdkRegion = NULL;
+ if (!m_currentClippingRegion.IsEmpty())
+ gdkRegion = m_currentClippingRegion.GetRegion();
+
+ gdk_gc_set_clip_region(m_penGC, gdkRegion);
+ gdk_gc_set_clip_region(m_brushGC, gdkRegion);
+ gdk_gc_set_clip_region(m_textGC, gdkRegion);
+ gdk_gc_set_clip_region(m_bgGC, gdkRegion);
}
void wxWindowDCImpl::Destroy()
wxPoint ptOrigin = win->GetClientAreaOrigin();
SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
wxSize size = win->GetClientSize();
- SetClippingRegion(wxPoint(0, 0), size);
+ DoSetClippingRegion(0, 0, size.x, size.y);
#endif
// __WXUNIVERSAL__
}
void wxDCModule::OnExit()
{
wxCleanUpGCPool();
+
+ for (int i = wxBRUSHSTYLE_LAST_HATCH - wxBRUSHSTYLE_FIRST_HATCH; i--; )
+ {
+ if (hatches[i])
+ g_object_unref(hatches[i]);
+ }
}
projects / wxWidgets.git / blobdiff