From 7d5af6fa6bad1fea903de4f7cb69889f51c6a5d9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 18 Sep 1999 16:32:53 +0000 Subject: [PATCH] 'static not in the beginning of the decl' warnings fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dcclient.cpp | 518 +++++++++++++++++++++--------------------- src/gtk1/dcclient.cpp | 518 +++++++++++++++++++++--------------------- 2 files changed, 518 insertions(+), 518 deletions(-) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index d68a6746ee..e75b32227e 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -68,7 +68,7 @@ void gdk_draw_bitmap (GdkDrawable *drawable, src_private = (GdkWindowPrivate*) src; if (drawable_private->destroyed || src_private->destroyed) return; - + gc_private = (GdkGCPrivate*) gc; if (width == -1) width = src_private->width; @@ -111,29 +111,29 @@ wxWindowDC::wxWindowDC( wxWindow *window ) m_owner = (wxWindow *)NULL; m_isMemDC = FALSE; m_font = window->GetFont(); - + wxASSERT_MSG( window, _T("DC needs a window") ); - + GtkWidget *widget = window->m_wxwindow; - + wxASSERT_MSG( widget, _T("DC needs a widget") ); - + m_window = widget->window; - + /* not realized ? */ if (!m_window) { /* don't report problems */ - m_ok = TRUE; - - return; + m_ok = TRUE; + + return; } - + if (window->m_wxwindow) m_cmap = gtk_widget_get_colormap( window->m_wxwindow ); else m_cmap = gtk_widget_get_colormap( window->m_widget ); - + SetUpDC(); /* this must be done after SetUpDC, bacause SetUpDC calls the @@ -142,7 +142,7 @@ wxWindowDC::wxWindowDC( wxWindow *window ) and this might not be desired as the standard dc background is white whereas a window might assume gray to be the standard (as e.g. wxStatusBar) */ - + m_owner = window; } @@ -151,7 +151,7 @@ wxWindowDC::~wxWindowDC() Destroy(); } -void wxWindowDC::DoFloodFill( long WXUNUSED(x), long WXUNUSED(y), +void wxWindowDC::DoFloodFill( long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style) ) { wxFAIL_MSG( _T("wxWindowDC::DoFloodFill not implemented") ); @@ -166,12 +166,12 @@ bool wxWindowDC::DoGetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXU void wxWindowDC::DoDrawLine( long x1, long y1, long x2, long y2 ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen.GetStyle() != wxTRANSPARENT) { if (m_window) gdk_draw_line( m_window, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) ); - + CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); } @@ -180,7 +180,7 @@ void wxWindowDC::DoDrawLine( long x1, long y1, long x2, long y2 ) void wxWindowDC::DoCrossHair( long x, long y ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen.GetStyle() != wxTRANSPARENT) { int w = 0; @@ -189,10 +189,10 @@ void wxWindowDC::DoCrossHair( long x, long y ) long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); if (m_window) - { + { gdk_draw_line( m_window, m_penGC, 0, yy, XLOG2DEVREL(w), yy ); gdk_draw_line( m_window, m_penGC, xx, 0, xx, YLOG2DEVREL(h) ); - } + } } } @@ -200,30 +200,30 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - - long xx1 = XLOG2DEV(x1); + + long xx1 = XLOG2DEV(x1); long yy1 = YLOG2DEV(y1); - long xx2 = XLOG2DEV(x2); + long xx2 = XLOG2DEV(x2); long yy2 = YLOG2DEV(y2); - long xxc = XLOG2DEV(xc); + long xxc = XLOG2DEV(xc); long yyc = YLOG2DEV(yc); - double dx = xx1 - xxc; + double dx = xx1 - xxc; double dy = yy1 - yyc; double radius = sqrt(dx*dx+dy*dy); long r = (long)radius; double radius1, radius2; - if (xx1 == xx2 && yy1 == yy2) + if (xx1 == xx2 && yy1 == yy2) { radius1 = 0.0; radius2 = 360.0; - } - else - if (radius == 0.0) + } + else + if (radius == 0.0) { radius1 = radius2 = 0.0; - } - else + } + else { radius1 = (xx1 - xxc == 0) ? (yy1 - yyc < 0) ? 90.0 : -90.0 : @@ -241,11 +241,11 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, { if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); } - + CalcBoundingBox (x1, y1); CalcBoundingBox (x2, y2); } @@ -253,28 +253,28 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, void wxWindowDC::DoDrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - - long xx = XLOG2DEV(x); + + long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); + long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); - + // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } if (hh < 0) { hh = -hh; yy = yy - hh; } - + if (m_window) { long start = long(sa * 64.0); long end = long(ea * 64.0); - + if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, start, end ); } - + CalcBoundingBox (x, y); CalcBoundingBox (x + width, y + height); } @@ -282,32 +282,32 @@ void wxWindowDC::DoDrawEllipticArc( long x, long y, long width, long height, dou void wxWindowDC::DoDrawPoint( long x, long y ) { wxCHECK_RET( Ok(), _T("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[], long xoffset, long yoffset ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen.GetStyle() == wxTRANSPARENT) return; if (n <= 0) return; - + CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); - + for (int i = 0; i < n-1; i++) { long x1 = XLOG2DEV(points[i].x + xoffset); long x2 = XLOG2DEV(points[i+1].x + xoffset); long y1 = YLOG2DEV(points[i].y + yoffset); // oh, what a waste long y2 = YLOG2DEV(points[i+1].y + yoffset); - - if (m_window) + + if (m_window) gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 ); - + CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset ); } } @@ -315,36 +315,36 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], long xoffset, long yoffse void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle) ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (n <= 0) return; - + GdkPoint *gdkpoints = new GdkPoint[n+1]; int i; for (i = 0 ; i < n ; i++) { gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset); gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset); - + CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset ); } - + if ((m_brush.GetStyle() != wxTRANSPARENT) && m_window) gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n); - + // To do: Fillstyle - + if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window) { for (i = 0 ; i < n ; i++) { - gdk_draw_line( m_window, m_penGC, + gdk_draw_line( m_window, m_penGC, gdkpoints[i%n].x, gdkpoints[i%n].y, gdkpoints[(i+1)%n].x, gdkpoints[(i+1)%n].y); } } - + delete[] gdkpoints; } @@ -356,7 +356,7 @@ void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height ) long yy = YLOG2DEV(y); long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); - + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; @@ -368,11 +368,11 @@ void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height ) { if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 ); } - + CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } @@ -380,12 +380,12 @@ void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height ) void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height, double radius ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (radius < 0.0) radius = - radius * ((width < height) ? width : height); - - long xx = XLOG2DEV(x); + + long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); + long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); long rr = XLOG2DEVREL((long)radius); @@ -430,9 +430,9 @@ void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 ); gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 ); } - + if (m_pen.GetStyle() != wxTRANSPARENT) - { + { gdk_draw_line( m_window, m_penGC, xx+rr, yy, xx+ww-rr, yy ); gdk_draw_line( m_window, m_penGC, xx+rr, yy+hh, xx+ww-rr, yy+hh ); gdk_draw_line( m_window, m_penGC, xx, yy+rr, xx, yy+hh-rr ); @@ -441,9 +441,9 @@ void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy, dd, dd, 0, 90*64 ); gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 ); gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 ); - } + } } - + // this ignores the radius CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -452,25 +452,25 @@ void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height void wxWindowDC::DoDrawEllipse( long x, long y, long width, long height ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - - long xx = XLOG2DEV(x); + + long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); + long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } if (hh < 0) { hh = -hh; yy = yy - hh; } - + if (m_window) { if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 ); } - + CalcBoundingBox( x - width, y - height ); CalcBoundingBox( x + width, y + height ); } @@ -486,54 +486,54 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap, bool useMask ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") ); - + /* scale/translate size and position */ - + int xx = XLOG2DEV(x); int yy = YLOG2DEV(y); - + int w = bitmap.GetWidth(); int h = bitmap.GetHeight(); - + CalcBoundingBox( x, y ); CalcBoundingBox( x + w, y + h ); - + if (!m_window) return; - + int ww = XLOG2DEVREL(w); int hh = YLOG2DEVREL(h); - + /* scale bitmap if required */ - + wxBitmap use_bitmap; - + if ((w != ww) || (h != hh)) { wxImage image( bitmap ); image = image.Scale( ww, hh ); - + use_bitmap = image.ConvertToBitmap(); } else { use_bitmap = bitmap; } - + /* apply mask if any */ - + GdkBitmap *mask = (GdkBitmap *) NULL; if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap(); - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_origin( m_penGC, xx, yy ); } - + /* draw XPixmap or XBitmap, depending on what the wxBitmap contains */ - + GdkPixmap *pm = use_bitmap.GetPixmap(); if (pm) { @@ -547,10 +547,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap, gdk_draw_bitmap( m_window, m_penGC, bm, 0, 0, xx, yy, -1, -1 ); } } - + /* remove mask again if any */ - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_origin( m_penGC, 0, 0 ); @@ -567,26 +567,26 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, knows about possible mask information in a memory dc. */ wxCHECK_MSG( Ok(), FALSE, _T("invalid window dc") ); - + wxCHECK_MSG( source, FALSE, _T("invalid source dc") ); - + if (!m_window) return FALSE; - + wxClientDC *srcDC = (wxClientDC*)source; wxMemoryDC *memDC = (wxMemoryDC*)source; - + bool use_bitmap_method = FALSE; - + if (srcDC->m_isMemDC) { if (!memDC->m_selected.Ok()) return FALSE; - + /* we use the "XCopyArea" way to copy a memory dc into y different window if the memory dc BOTH a) doesn't have any mask or its mask isn't used b) it is clipped c) is not 1-bit */ - + if (useMask && (memDC->m_selected.GetMask())) { /* we HAVE TO use the direct way for memory dcs @@ -605,9 +605,9 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, (width == memDC->m_selected.GetWidth()) && (height == memDC->m_selected.GetHeight())) { - /* we SHOULD use the direct way if all of the bitmap - in the memory dc is copied in which case XCopyArea - wouldn't be able able to boost performace by reducing + /* we SHOULD use the direct way if all of the bitmap + in the memory dc is copied in which case XCopyArea + wouldn't be able able to boost performace by reducing the area to be scaled */ use_bitmap_method = TRUE; } @@ -616,60 +616,60 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, use_bitmap_method = FALSE; } } - + CalcBoundingBox( xdest, ydest ); CalcBoundingBox( xdest + width, ydest + height ); - + int old_logical_func = m_logicalFunction; SetLogicalFunction( logical_func ); - + if (use_bitmap_method) { /* scale/translate bitmap size */ - + long bm_width = memDC->m_selected.GetWidth(); long bm_height = memDC->m_selected.GetHeight(); - + long bm_ww = XLOG2DEVREL( bm_width ); long bm_hh = YLOG2DEVREL( bm_height ); - + /* scale bitmap if required */ - + wxBitmap use_bitmap; - + if ((bm_width != bm_ww) || (bm_height != bm_hh)) { wxImage image( memDC->m_selected ); image = image.Scale( bm_ww, bm_hh ); - + use_bitmap = image.ConvertToBitmap(); } else { use_bitmap = memDC->m_selected; } - + /* scale/translate size and position */ - + long xx = XLOG2DEV(xdest); long yy = YLOG2DEV(ydest); - + long ww = XLOG2DEVREL(width); long hh = YLOG2DEVREL(height); - + /* apply mask if any */ - + GdkBitmap *mask = (GdkBitmap *) NULL; if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap(); - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_origin( m_penGC, xx, yy ); } - + /* draw XPixmap or XBitmap, depending on what the wxBitmap contains */ - + GdkPixmap *pm = use_bitmap.GetPixmap(); if (pm) { @@ -685,10 +685,10 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, gdk_draw_bitmap( m_window, m_textGC, bm, xsrc, ysrc, xx, yy, ww, hh ); } } - + /* remove mask again if any */ - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_origin( m_penGC, 0, 0 ); @@ -697,13 +697,13 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, else /* use_bitmap_method */ { /* scale/translate size and position */ - + long xx = XLOG2DEV(xdest); long yy = YLOG2DEV(ydest); - + long ww = XLOG2DEVREL(width); long hh = YLOG2DEVREL(height); - + if ((width != ww) || (height != hh)) { /* draw source window into a bitmap as we cannot scale @@ -718,30 +718,30 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, Is a double XGetImage and combined XGetPixel and XPutPixel really faster? I'm not sure. look at wxXt for a different implementation of the same problem. */ - + wxBitmap bitmap( width, height ); - gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0, + gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0, srcDC->GetWindow(), xsrc, ysrc, width, height ); - + /* scale image */ - + wxImage image( bitmap ); image = image.Scale( ww, hh ); - + /* convert to bitmap */ - + bitmap = image.ConvertToBitmap(); - + /* draw scaled bitmap */ - + gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 ); - + } else { /* no scaling and not a memory dc with a mask either */ - + gdk_window_copy_area( m_window, m_penGC, xx, yy, srcDC->GetWindow(), xsrc, ysrc, width, height ); @@ -757,7 +757,7 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y ) wxCHECK_RET( Ok(), _T("invalid window dc") ); if (!m_window) return; - + GdkFont *font = m_font.GetInternalFont( m_scaleY ); x = XLOG2DEV(x); @@ -784,7 +784,7 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y ) if (font->descent > 0) ul_y++; gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y); } - + long w, h; GetTextExtent (text, &w, &h); CalcBoundingBox (x + w, y + h); @@ -797,7 +797,7 @@ void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *heigh { wxFont fontToUse = m_font; if (theFont) fontToUse = *theFont; - + GdkFont *font = fontToUse.GetInternalFont( m_scaleY ); if (width) (*width) = long(gdk_string_width( font, string.mbc_str() ) / m_scaleX); if (height) (*height) = long((font->ascent + font->descent) / m_scaleY); @@ -820,16 +820,16 @@ long wxWindowDC::GetCharHeight() const void wxWindowDC::Clear() { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (!m_window) return; - + /* - 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) { int width,height; @@ -855,15 +855,15 @@ void wxWindowDC::SetFont( const wxFont &font ) void wxWindowDC::SetPen( const wxPen &pen ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen == pen) return; - + m_pen = pen; - + if (!m_pen.Ok()) return; - + if (!m_window) return; - + gint width = m_pen.GetWidth(); if (width <= 0) { @@ -879,69 +879,69 @@ void wxWindowDC::SetPen( const wxPen &pen ) fabs((double) YLOG2DEVREL(width)) ) / 2.0; width = (int)w; } - - const static char dotted[] = {1, 1}; - const static char short_dashed[] = {2, 2}; - const static char long_dashed[] = {2, 4}; - const static char dotted_dashed[] = {3, 3, 1, 3}; - + + static const char dotted[] = {1, 1}; + static const char short_dashed[] = {2, 2}; + static const char long_dashed[] = {2, 4}; + static const char dotted_dashed[] = {3, 3, 1, 3}; + // We express dash pattern in pen width unit, so we are // independent of zoom factor and so on... int req_nb_dash; const char *req_dash; - + GdkLineStyle lineStyle = GDK_LINE_SOLID; switch (m_pen.GetStyle()) { case wxUSER_DASH: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = m_pen.GetDashCount(); req_dash = m_pen.GetDash(); break; - } - case wxDOT: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + } + case wxDOT: + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 2; req_dash = dotted; - break; - } - case wxLONG_DASH: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + break; + } + case wxLONG_DASH: + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 2; req_dash = long_dashed; - break; - } - case wxSHORT_DASH: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + break; + } + case wxSHORT_DASH: + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 2; req_dash = short_dashed; - break; - } - case wxDOT_DASH: - { -// lineStyle = GDK_LINE_DOUBLE_DASH; - lineStyle = GDK_LINE_ON_OFF_DASH; + break; + } + case wxDOT_DASH: + { +// lineStyle = GDK_LINE_DOUBLE_DASH; + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 4; req_dash = dotted_dashed; - break; - } - - case wxTRANSPARENT: - case wxSTIPPLE: - case wxSOLID: - default: - { - lineStyle = GDK_LINE_SOLID; + break; + } + + case wxTRANSPARENT: + case wxSTIPPLE: + case wxSOLID: + default: + { + lineStyle = GDK_LINE_SOLID; req_dash = (wxDash*)NULL; req_nb_dash = 0; - break; - } + break; + } } - + #if (GTK_MINOR_VERSION > 0) if (req_dash && req_nb_dash) { @@ -950,17 +950,17 @@ void wxWindowDC::SetPen( const wxPen &pen ) { for (int i = 0; i < req_nb_dash; i++) real_req_dash[i] = req_dash[i] * width; - gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); + gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); delete[] real_req_dash; } else { // No Memory. We use non-scaled dash pattern... - gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash ); + gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash ); } } #endif - + GdkCapStyle capStyle = GDK_CAP_ROUND; switch (m_pen.GetCap()) { @@ -968,7 +968,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) case wxCAP_PROJECTING: { capStyle = GDK_CAP_PROJECTING; break; } case wxCAP_BUTT: { capStyle = GDK_CAP_BUTT; break; } } - + GdkJoinStyle joinStyle = GDK_JOIN_ROUND; switch (m_pen.GetJoin()) { @@ -976,9 +976,9 @@ void wxWindowDC::SetPen( const wxPen &pen ) case wxJOIN_ROUND: { joinStyle = GDK_JOIN_ROUND; break; } case wxJOIN_MITER: { joinStyle = GDK_JOIN_MITER; break; } } - + gdk_gc_set_line_attributes( m_penGC, width, lineStyle, capStyle, joinStyle ); - + m_pen.GetColour().CalcPixel( m_cmap ); gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() ); } @@ -986,34 +986,34 @@ void wxWindowDC::SetPen( const wxPen &pen ) void wxWindowDC::SetBrush( const wxBrush &brush ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_brush == brush) return; - + m_brush = brush; - + if (!m_brush.Ok()) return; - + if (!m_window) return; - + m_brush.GetColour().CalcPixel( m_cmap ); gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() ); - + gdk_gc_set_fill( m_brushGC, GDK_SOLID ); - + if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok())) { if (m_brush.GetStipple()->GetPixmap()) - { + { gdk_gc_set_fill( m_brushGC, GDK_TILED ); gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() ); - } + } else - { + { gdk_gc_set_fill( m_brushGC, GDK_STIPPLED ); gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() ); - } + } } - + if (IS_HATCH(m_brush.GetStyle())) { gdk_gc_set_fill( m_brushGC, GDK_STIPPLED ); @@ -1026,17 +1026,17 @@ void wxWindowDC::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(), _T("invalid window dc") ); - + if (m_backgroundBrush == brush) return; - + m_backgroundBrush = brush; - + if (!m_backgroundBrush.Ok()) return; - + if (!m_window) 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() ); @@ -1044,21 +1044,21 @@ void wxWindowDC::SetBackground( const wxBrush &brush ) gdk_gc_set_foreground( m_bgGC, m_backgroundBrush.GetColour().GetColor() ); gdk_gc_set_fill( m_bgGC, GDK_SOLID ); - + if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok())) { if (m_backgroundBrush.GetStipple()->GetPixmap()) - { + { gdk_gc_set_fill( m_bgGC, GDK_TILED ); gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() ); - } + } else - { + { gdk_gc_set_fill( m_bgGC, GDK_STIPPLED ); gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetBitmap() ); - } + } } - + if (IS_HATCH(m_backgroundBrush.GetStyle())) { gdk_gc_set_fill( m_bgGC, GDK_STIPPLED ); @@ -1070,7 +1070,7 @@ void wxWindowDC::SetBackground( const wxBrush &brush ) void wxWindowDC::SetLogicalFunction( int function ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_logicalFunction == function) return; GdkFunction mode = GDK_COPY; @@ -1084,28 +1084,28 @@ void wxWindowDC::SetLogicalFunction( int function ) case wxCLEAR: mode = GDK_CLEAR; break; case wxSET: mode = GDK_SET; break; case wxOR_INVERT: mode = GDK_OR_INVERT; break; - case wxSRC_AND: + case wxSRC_AND: case wxAND: mode = GDK_AND; break; - case wxSRC_OR: + case wxSRC_OR: case wxOR: mode = GDK_OR; break; case wxEQUIV: mode = GDK_EQUIV; break; case wxNAND: mode = GDK_NAND; break; case wxAND_INVERT: mode = GDK_AND_INVERT; break; - case wxCOPY: mode = GDK_COPY; break; - case wxNO_OP: mode = GDK_NOOP; break; - case wxSRC_INVERT: mode = GDK_COPY_INVERT; break; + case wxCOPY: mode = GDK_COPY; break; + case wxNO_OP: mode = GDK_NOOP; break; + case wxSRC_INVERT: mode = GDK_COPY_INVERT; break; #endif default: - { - wxFAIL_MSG( _T("unsupported logical function") ); - break; - } + { + wxFAIL_MSG( _T("unsupported logical function") ); + break; + } } - + m_logicalFunction = function; - + if (!m_window) return; - + gdk_gc_set_function( m_penGC, mode ); gdk_gc_set_function( m_brushGC, mode ); gdk_gc_set_function( m_textGC, mode ); @@ -1114,14 +1114,14 @@ void wxWindowDC::SetLogicalFunction( int function ) void wxWindowDC::SetTextForeground( const wxColour &col ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_textForegroundColour == col) return; - + m_textForegroundColour = col; if (!m_textForegroundColour.Ok()) return; - + if (!m_window) return; - + m_textForegroundColour.CalcPixel( m_cmap ); gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() ); } @@ -1129,14 +1129,14 @@ void wxWindowDC::SetTextForeground( const wxColour &col ) void wxWindowDC::SetTextBackground( const wxColour &col ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_textBackgroundColour == col) return; - + m_textBackgroundColour = col; if (!m_textBackgroundColour.Ok()) return; - + if (!m_window) return; - + m_textBackgroundColour.CalcPixel( m_cmap ); gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() ); } @@ -1144,14 +1144,14 @@ void wxWindowDC::SetTextBackground( const wxColour &col ) void wxWindowDC::SetBackgroundMode( int mode ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + m_backgroundMode = mode; if (!m_window) return; - + // 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) { gdk_gc_set_fill( m_brushGC, @@ -1167,11 +1167,11 @@ void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) ) void wxWindowDC::DoSetClippingRegion( long x, long y, long width, long height ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxDC::DoSetClippingRegion( x, y, width, height ); - + if (!m_window) return; - + GdkRectangle rect; rect.x = XLOG2DEV(x); rect.y = YLOG2DEV(y); @@ -1186,15 +1186,15 @@ void wxWindowDC::DoSetClippingRegion( long x, long y, long width, long height ) void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (region.Empty()) { DestroyClippingRegion(); return; } - + if (!m_window) return; - + gdk_gc_set_clip_region( m_penGC, region.GetRegion() ); gdk_gc_set_clip_region( m_brushGC, region.GetRegion() ); gdk_gc_set_clip_region( m_textGC, region.GetRegion() ); @@ -1204,11 +1204,11 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxWindowDC::DestroyClippingRegion() { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxDC::DestroyClippingRegion(); - + if (!m_window) return; - + 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 ); @@ -1224,26 +1224,26 @@ void wxWindowDC::SetUpDC() m_brushGC = gdk_gc_new( m_window ); m_textGC = gdk_gc_new( m_window ); m_bgGC = gdk_gc_new( m_window ); - + wxColour tmp_col( m_textForegroundColour ); m_textForegroundColour = wxNullColour; SetTextForeground( tmp_col ); tmp_col = m_textBackgroundColour; m_textBackgroundColour = wxNullColour; SetTextBackground( tmp_col ); - + wxPen tmp_pen( m_pen ); m_pen = wxNullPen; SetPen( tmp_pen ); - + wxFont tmp_font( m_font ); m_font = wxNullFont; SetFont( tmp_font ); - + wxBrush tmp_brush( m_brush ); m_brush = wxNullBrush; SetBrush( tmp_brush ); - + /* tmp_brush = m_backgroundBrush; m_backgroundBrush = wxNullBrush; @@ -1253,8 +1253,8 @@ void wxWindowDC::SetUpDC() m_backgroundBrush = wxNullBrush; SetBackground( *wxWHITE_BRUSH ); m_backgroundBrush = tmp_brush; - - if (!hatch_bitmap) + + if (!hatch_bitmap) { hatch_bitmap = hatches; hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height ); @@ -1430,7 +1430,7 @@ static void wx_spline_draw_point_array(wxDC *dc) void wxWindowDC::DoDrawSpline( wxList *points ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxPoint *p; double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; double x1, y1, x2, y2; diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index d68a6746ee..e75b32227e 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -68,7 +68,7 @@ void gdk_draw_bitmap (GdkDrawable *drawable, src_private = (GdkWindowPrivate*) src; if (drawable_private->destroyed || src_private->destroyed) return; - + gc_private = (GdkGCPrivate*) gc; if (width == -1) width = src_private->width; @@ -111,29 +111,29 @@ wxWindowDC::wxWindowDC( wxWindow *window ) m_owner = (wxWindow *)NULL; m_isMemDC = FALSE; m_font = window->GetFont(); - + wxASSERT_MSG( window, _T("DC needs a window") ); - + GtkWidget *widget = window->m_wxwindow; - + wxASSERT_MSG( widget, _T("DC needs a widget") ); - + m_window = widget->window; - + /* not realized ? */ if (!m_window) { /* don't report problems */ - m_ok = TRUE; - - return; + m_ok = TRUE; + + return; } - + if (window->m_wxwindow) m_cmap = gtk_widget_get_colormap( window->m_wxwindow ); else m_cmap = gtk_widget_get_colormap( window->m_widget ); - + SetUpDC(); /* this must be done after SetUpDC, bacause SetUpDC calls the @@ -142,7 +142,7 @@ wxWindowDC::wxWindowDC( wxWindow *window ) and this might not be desired as the standard dc background is white whereas a window might assume gray to be the standard (as e.g. wxStatusBar) */ - + m_owner = window; } @@ -151,7 +151,7 @@ wxWindowDC::~wxWindowDC() Destroy(); } -void wxWindowDC::DoFloodFill( long WXUNUSED(x), long WXUNUSED(y), +void wxWindowDC::DoFloodFill( long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style) ) { wxFAIL_MSG( _T("wxWindowDC::DoFloodFill not implemented") ); @@ -166,12 +166,12 @@ bool wxWindowDC::DoGetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXU void wxWindowDC::DoDrawLine( long x1, long y1, long x2, long y2 ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen.GetStyle() != wxTRANSPARENT) { if (m_window) gdk_draw_line( m_window, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) ); - + CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); } @@ -180,7 +180,7 @@ void wxWindowDC::DoDrawLine( long x1, long y1, long x2, long y2 ) void wxWindowDC::DoCrossHair( long x, long y ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen.GetStyle() != wxTRANSPARENT) { int w = 0; @@ -189,10 +189,10 @@ void wxWindowDC::DoCrossHair( long x, long y ) long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); if (m_window) - { + { gdk_draw_line( m_window, m_penGC, 0, yy, XLOG2DEVREL(w), yy ); gdk_draw_line( m_window, m_penGC, xx, 0, xx, YLOG2DEVREL(h) ); - } + } } } @@ -200,30 +200,30 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - - long xx1 = XLOG2DEV(x1); + + long xx1 = XLOG2DEV(x1); long yy1 = YLOG2DEV(y1); - long xx2 = XLOG2DEV(x2); + long xx2 = XLOG2DEV(x2); long yy2 = YLOG2DEV(y2); - long xxc = XLOG2DEV(xc); + long xxc = XLOG2DEV(xc); long yyc = YLOG2DEV(yc); - double dx = xx1 - xxc; + double dx = xx1 - xxc; double dy = yy1 - yyc; double radius = sqrt(dx*dx+dy*dy); long r = (long)radius; double radius1, radius2; - if (xx1 == xx2 && yy1 == yy2) + if (xx1 == xx2 && yy1 == yy2) { radius1 = 0.0; radius2 = 360.0; - } - else - if (radius == 0.0) + } + else + if (radius == 0.0) { radius1 = radius2 = 0.0; - } - else + } + else { radius1 = (xx1 - xxc == 0) ? (yy1 - yyc < 0) ? 90.0 : -90.0 : @@ -241,11 +241,11 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, { if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); } - + CalcBoundingBox (x1, y1); CalcBoundingBox (x2, y2); } @@ -253,28 +253,28 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, void wxWindowDC::DoDrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - - long xx = XLOG2DEV(x); + + long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); + long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); - + // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } if (hh < 0) { hh = -hh; yy = yy - hh; } - + if (m_window) { long start = long(sa * 64.0); long end = long(ea * 64.0); - + if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, start, end ); } - + CalcBoundingBox (x, y); CalcBoundingBox (x + width, y + height); } @@ -282,32 +282,32 @@ void wxWindowDC::DoDrawEllipticArc( long x, long y, long width, long height, dou void wxWindowDC::DoDrawPoint( long x, long y ) { wxCHECK_RET( Ok(), _T("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[], long xoffset, long yoffset ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen.GetStyle() == wxTRANSPARENT) return; if (n <= 0) return; - + CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); - + for (int i = 0; i < n-1; i++) { long x1 = XLOG2DEV(points[i].x + xoffset); long x2 = XLOG2DEV(points[i+1].x + xoffset); long y1 = YLOG2DEV(points[i].y + yoffset); // oh, what a waste long y2 = YLOG2DEV(points[i+1].y + yoffset); - - if (m_window) + + if (m_window) gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 ); - + CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset ); } } @@ -315,36 +315,36 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], long xoffset, long yoffse void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle) ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (n <= 0) return; - + GdkPoint *gdkpoints = new GdkPoint[n+1]; int i; for (i = 0 ; i < n ; i++) { gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset); gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset); - + CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset ); } - + if ((m_brush.GetStyle() != wxTRANSPARENT) && m_window) gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n); - + // To do: Fillstyle - + if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window) { for (i = 0 ; i < n ; i++) { - gdk_draw_line( m_window, m_penGC, + gdk_draw_line( m_window, m_penGC, gdkpoints[i%n].x, gdkpoints[i%n].y, gdkpoints[(i+1)%n].x, gdkpoints[(i+1)%n].y); } } - + delete[] gdkpoints; } @@ -356,7 +356,7 @@ void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height ) long yy = YLOG2DEV(y); long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); - + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; @@ -368,11 +368,11 @@ void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height ) { if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 ); } - + CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } @@ -380,12 +380,12 @@ void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height ) void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height, double radius ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (radius < 0.0) radius = - radius * ((width < height) ? width : height); - - long xx = XLOG2DEV(x); + + long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); + long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); long rr = XLOG2DEVREL((long)radius); @@ -430,9 +430,9 @@ void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 ); gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 ); } - + if (m_pen.GetStyle() != wxTRANSPARENT) - { + { gdk_draw_line( m_window, m_penGC, xx+rr, yy, xx+ww-rr, yy ); gdk_draw_line( m_window, m_penGC, xx+rr, yy+hh, xx+ww-rr, yy+hh ); gdk_draw_line( m_window, m_penGC, xx, yy+rr, xx, yy+hh-rr ); @@ -441,9 +441,9 @@ void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy, dd, dd, 0, 90*64 ); gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 ); gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 ); - } + } } - + // this ignores the radius CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -452,25 +452,25 @@ void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height void wxWindowDC::DoDrawEllipse( long x, long y, long width, long height ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - - long xx = XLOG2DEV(x); + + long xx = XLOG2DEV(x); long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); + long ww = m_signX * XLOG2DEVREL(width); long hh = m_signY * YLOG2DEVREL(height); // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } if (hh < 0) { hh = -hh; yy = yy - hh; } - + if (m_window) { if (m_brush.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 ); - + if (m_pen.GetStyle() != wxTRANSPARENT) gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 ); } - + CalcBoundingBox( x - width, y - height ); CalcBoundingBox( x + width, y + height ); } @@ -486,54 +486,54 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap, bool useMask ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") ); - + /* scale/translate size and position */ - + int xx = XLOG2DEV(x); int yy = YLOG2DEV(y); - + int w = bitmap.GetWidth(); int h = bitmap.GetHeight(); - + CalcBoundingBox( x, y ); CalcBoundingBox( x + w, y + h ); - + if (!m_window) return; - + int ww = XLOG2DEVREL(w); int hh = YLOG2DEVREL(h); - + /* scale bitmap if required */ - + wxBitmap use_bitmap; - + if ((w != ww) || (h != hh)) { wxImage image( bitmap ); image = image.Scale( ww, hh ); - + use_bitmap = image.ConvertToBitmap(); } else { use_bitmap = bitmap; } - + /* apply mask if any */ - + GdkBitmap *mask = (GdkBitmap *) NULL; if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap(); - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_origin( m_penGC, xx, yy ); } - + /* draw XPixmap or XBitmap, depending on what the wxBitmap contains */ - + GdkPixmap *pm = use_bitmap.GetPixmap(); if (pm) { @@ -547,10 +547,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap, gdk_draw_bitmap( m_window, m_penGC, bm, 0, 0, xx, yy, -1, -1 ); } } - + /* remove mask again if any */ - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_origin( m_penGC, 0, 0 ); @@ -567,26 +567,26 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, knows about possible mask information in a memory dc. */ wxCHECK_MSG( Ok(), FALSE, _T("invalid window dc") ); - + wxCHECK_MSG( source, FALSE, _T("invalid source dc") ); - + if (!m_window) return FALSE; - + wxClientDC *srcDC = (wxClientDC*)source; wxMemoryDC *memDC = (wxMemoryDC*)source; - + bool use_bitmap_method = FALSE; - + if (srcDC->m_isMemDC) { if (!memDC->m_selected.Ok()) return FALSE; - + /* we use the "XCopyArea" way to copy a memory dc into y different window if the memory dc BOTH a) doesn't have any mask or its mask isn't used b) it is clipped c) is not 1-bit */ - + if (useMask && (memDC->m_selected.GetMask())) { /* we HAVE TO use the direct way for memory dcs @@ -605,9 +605,9 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, (width == memDC->m_selected.GetWidth()) && (height == memDC->m_selected.GetHeight())) { - /* we SHOULD use the direct way if all of the bitmap - in the memory dc is copied in which case XCopyArea - wouldn't be able able to boost performace by reducing + /* we SHOULD use the direct way if all of the bitmap + in the memory dc is copied in which case XCopyArea + wouldn't be able able to boost performace by reducing the area to be scaled */ use_bitmap_method = TRUE; } @@ -616,60 +616,60 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, use_bitmap_method = FALSE; } } - + CalcBoundingBox( xdest, ydest ); CalcBoundingBox( xdest + width, ydest + height ); - + int old_logical_func = m_logicalFunction; SetLogicalFunction( logical_func ); - + if (use_bitmap_method) { /* scale/translate bitmap size */ - + long bm_width = memDC->m_selected.GetWidth(); long bm_height = memDC->m_selected.GetHeight(); - + long bm_ww = XLOG2DEVREL( bm_width ); long bm_hh = YLOG2DEVREL( bm_height ); - + /* scale bitmap if required */ - + wxBitmap use_bitmap; - + if ((bm_width != bm_ww) || (bm_height != bm_hh)) { wxImage image( memDC->m_selected ); image = image.Scale( bm_ww, bm_hh ); - + use_bitmap = image.ConvertToBitmap(); } else { use_bitmap = memDC->m_selected; } - + /* scale/translate size and position */ - + long xx = XLOG2DEV(xdest); long yy = YLOG2DEV(ydest); - + long ww = XLOG2DEVREL(width); long hh = YLOG2DEVREL(height); - + /* apply mask if any */ - + GdkBitmap *mask = (GdkBitmap *) NULL; if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap(); - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_origin( m_penGC, xx, yy ); } - + /* draw XPixmap or XBitmap, depending on what the wxBitmap contains */ - + GdkPixmap *pm = use_bitmap.GetPixmap(); if (pm) { @@ -685,10 +685,10 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, gdk_draw_bitmap( m_window, m_textGC, bm, xsrc, ysrc, xx, yy, ww, hh ); } } - + /* remove mask again if any */ - - if (useMask && mask) + + if (useMask && mask) { gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_origin( m_penGC, 0, 0 ); @@ -697,13 +697,13 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, else /* use_bitmap_method */ { /* scale/translate size and position */ - + long xx = XLOG2DEV(xdest); long yy = YLOG2DEV(ydest); - + long ww = XLOG2DEVREL(width); long hh = YLOG2DEVREL(height); - + if ((width != ww) || (height != hh)) { /* draw source window into a bitmap as we cannot scale @@ -718,30 +718,30 @@ bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height, Is a double XGetImage and combined XGetPixel and XPutPixel really faster? I'm not sure. look at wxXt for a different implementation of the same problem. */ - + wxBitmap bitmap( width, height ); - gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0, + gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0, srcDC->GetWindow(), xsrc, ysrc, width, height ); - + /* scale image */ - + wxImage image( bitmap ); image = image.Scale( ww, hh ); - + /* convert to bitmap */ - + bitmap = image.ConvertToBitmap(); - + /* draw scaled bitmap */ - + gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 ); - + } else { /* no scaling and not a memory dc with a mask either */ - + gdk_window_copy_area( m_window, m_penGC, xx, yy, srcDC->GetWindow(), xsrc, ysrc, width, height ); @@ -757,7 +757,7 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y ) wxCHECK_RET( Ok(), _T("invalid window dc") ); if (!m_window) return; - + GdkFont *font = m_font.GetInternalFont( m_scaleY ); x = XLOG2DEV(x); @@ -784,7 +784,7 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y ) if (font->descent > 0) ul_y++; gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y); } - + long w, h; GetTextExtent (text, &w, &h); CalcBoundingBox (x + w, y + h); @@ -797,7 +797,7 @@ void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *heigh { wxFont fontToUse = m_font; if (theFont) fontToUse = *theFont; - + GdkFont *font = fontToUse.GetInternalFont( m_scaleY ); if (width) (*width) = long(gdk_string_width( font, string.mbc_str() ) / m_scaleX); if (height) (*height) = long((font->ascent + font->descent) / m_scaleY); @@ -820,16 +820,16 @@ long wxWindowDC::GetCharHeight() const void wxWindowDC::Clear() { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (!m_window) return; - + /* - 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) { int width,height; @@ -855,15 +855,15 @@ void wxWindowDC::SetFont( const wxFont &font ) void wxWindowDC::SetPen( const wxPen &pen ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_pen == pen) return; - + m_pen = pen; - + if (!m_pen.Ok()) return; - + if (!m_window) return; - + gint width = m_pen.GetWidth(); if (width <= 0) { @@ -879,69 +879,69 @@ void wxWindowDC::SetPen( const wxPen &pen ) fabs((double) YLOG2DEVREL(width)) ) / 2.0; width = (int)w; } - - const static char dotted[] = {1, 1}; - const static char short_dashed[] = {2, 2}; - const static char long_dashed[] = {2, 4}; - const static char dotted_dashed[] = {3, 3, 1, 3}; - + + static const char dotted[] = {1, 1}; + static const char short_dashed[] = {2, 2}; + static const char long_dashed[] = {2, 4}; + static const char dotted_dashed[] = {3, 3, 1, 3}; + // We express dash pattern in pen width unit, so we are // independent of zoom factor and so on... int req_nb_dash; const char *req_dash; - + GdkLineStyle lineStyle = GDK_LINE_SOLID; switch (m_pen.GetStyle()) { case wxUSER_DASH: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = m_pen.GetDashCount(); req_dash = m_pen.GetDash(); break; - } - case wxDOT: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + } + case wxDOT: + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 2; req_dash = dotted; - break; - } - case wxLONG_DASH: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + break; + } + case wxLONG_DASH: + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 2; req_dash = long_dashed; - break; - } - case wxSHORT_DASH: - { - lineStyle = GDK_LINE_ON_OFF_DASH; + break; + } + case wxSHORT_DASH: + { + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 2; req_dash = short_dashed; - break; - } - case wxDOT_DASH: - { -// lineStyle = GDK_LINE_DOUBLE_DASH; - lineStyle = GDK_LINE_ON_OFF_DASH; + break; + } + case wxDOT_DASH: + { +// lineStyle = GDK_LINE_DOUBLE_DASH; + lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = 4; req_dash = dotted_dashed; - break; - } - - case wxTRANSPARENT: - case wxSTIPPLE: - case wxSOLID: - default: - { - lineStyle = GDK_LINE_SOLID; + break; + } + + case wxTRANSPARENT: + case wxSTIPPLE: + case wxSOLID: + default: + { + lineStyle = GDK_LINE_SOLID; req_dash = (wxDash*)NULL; req_nb_dash = 0; - break; - } + break; + } } - + #if (GTK_MINOR_VERSION > 0) if (req_dash && req_nb_dash) { @@ -950,17 +950,17 @@ void wxWindowDC::SetPen( const wxPen &pen ) { for (int i = 0; i < req_nb_dash; i++) real_req_dash[i] = req_dash[i] * width; - gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); + gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); delete[] real_req_dash; } else { // No Memory. We use non-scaled dash pattern... - gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash ); + gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash ); } } #endif - + GdkCapStyle capStyle = GDK_CAP_ROUND; switch (m_pen.GetCap()) { @@ -968,7 +968,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) case wxCAP_PROJECTING: { capStyle = GDK_CAP_PROJECTING; break; } case wxCAP_BUTT: { capStyle = GDK_CAP_BUTT; break; } } - + GdkJoinStyle joinStyle = GDK_JOIN_ROUND; switch (m_pen.GetJoin()) { @@ -976,9 +976,9 @@ void wxWindowDC::SetPen( const wxPen &pen ) case wxJOIN_ROUND: { joinStyle = GDK_JOIN_ROUND; break; } case wxJOIN_MITER: { joinStyle = GDK_JOIN_MITER; break; } } - + gdk_gc_set_line_attributes( m_penGC, width, lineStyle, capStyle, joinStyle ); - + m_pen.GetColour().CalcPixel( m_cmap ); gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() ); } @@ -986,34 +986,34 @@ void wxWindowDC::SetPen( const wxPen &pen ) void wxWindowDC::SetBrush( const wxBrush &brush ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_brush == brush) return; - + m_brush = brush; - + if (!m_brush.Ok()) return; - + if (!m_window) return; - + m_brush.GetColour().CalcPixel( m_cmap ); gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() ); - + gdk_gc_set_fill( m_brushGC, GDK_SOLID ); - + if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok())) { if (m_brush.GetStipple()->GetPixmap()) - { + { gdk_gc_set_fill( m_brushGC, GDK_TILED ); gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() ); - } + } else - { + { gdk_gc_set_fill( m_brushGC, GDK_STIPPLED ); gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() ); - } + } } - + if (IS_HATCH(m_brush.GetStyle())) { gdk_gc_set_fill( m_brushGC, GDK_STIPPLED ); @@ -1026,17 +1026,17 @@ void wxWindowDC::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(), _T("invalid window dc") ); - + if (m_backgroundBrush == brush) return; - + m_backgroundBrush = brush; - + if (!m_backgroundBrush.Ok()) return; - + if (!m_window) 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() ); @@ -1044,21 +1044,21 @@ void wxWindowDC::SetBackground( const wxBrush &brush ) gdk_gc_set_foreground( m_bgGC, m_backgroundBrush.GetColour().GetColor() ); gdk_gc_set_fill( m_bgGC, GDK_SOLID ); - + if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok())) { if (m_backgroundBrush.GetStipple()->GetPixmap()) - { + { gdk_gc_set_fill( m_bgGC, GDK_TILED ); gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() ); - } + } else - { + { gdk_gc_set_fill( m_bgGC, GDK_STIPPLED ); gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetBitmap() ); - } + } } - + if (IS_HATCH(m_backgroundBrush.GetStyle())) { gdk_gc_set_fill( m_bgGC, GDK_STIPPLED ); @@ -1070,7 +1070,7 @@ void wxWindowDC::SetBackground( const wxBrush &brush ) void wxWindowDC::SetLogicalFunction( int function ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_logicalFunction == function) return; GdkFunction mode = GDK_COPY; @@ -1084,28 +1084,28 @@ void wxWindowDC::SetLogicalFunction( int function ) case wxCLEAR: mode = GDK_CLEAR; break; case wxSET: mode = GDK_SET; break; case wxOR_INVERT: mode = GDK_OR_INVERT; break; - case wxSRC_AND: + case wxSRC_AND: case wxAND: mode = GDK_AND; break; - case wxSRC_OR: + case wxSRC_OR: case wxOR: mode = GDK_OR; break; case wxEQUIV: mode = GDK_EQUIV; break; case wxNAND: mode = GDK_NAND; break; case wxAND_INVERT: mode = GDK_AND_INVERT; break; - case wxCOPY: mode = GDK_COPY; break; - case wxNO_OP: mode = GDK_NOOP; break; - case wxSRC_INVERT: mode = GDK_COPY_INVERT; break; + case wxCOPY: mode = GDK_COPY; break; + case wxNO_OP: mode = GDK_NOOP; break; + case wxSRC_INVERT: mode = GDK_COPY_INVERT; break; #endif default: - { - wxFAIL_MSG( _T("unsupported logical function") ); - break; - } + { + wxFAIL_MSG( _T("unsupported logical function") ); + break; + } } - + m_logicalFunction = function; - + if (!m_window) return; - + gdk_gc_set_function( m_penGC, mode ); gdk_gc_set_function( m_brushGC, mode ); gdk_gc_set_function( m_textGC, mode ); @@ -1114,14 +1114,14 @@ void wxWindowDC::SetLogicalFunction( int function ) void wxWindowDC::SetTextForeground( const wxColour &col ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_textForegroundColour == col) return; - + m_textForegroundColour = col; if (!m_textForegroundColour.Ok()) return; - + if (!m_window) return; - + m_textForegroundColour.CalcPixel( m_cmap ); gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() ); } @@ -1129,14 +1129,14 @@ void wxWindowDC::SetTextForeground( const wxColour &col ) void wxWindowDC::SetTextBackground( const wxColour &col ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (m_textBackgroundColour == col) return; - + m_textBackgroundColour = col; if (!m_textBackgroundColour.Ok()) return; - + if (!m_window) return; - + m_textBackgroundColour.CalcPixel( m_cmap ); gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() ); } @@ -1144,14 +1144,14 @@ void wxWindowDC::SetTextBackground( const wxColour &col ) void wxWindowDC::SetBackgroundMode( int mode ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + m_backgroundMode = mode; if (!m_window) return; - + // 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) { gdk_gc_set_fill( m_brushGC, @@ -1167,11 +1167,11 @@ void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) ) void wxWindowDC::DoSetClippingRegion( long x, long y, long width, long height ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxDC::DoSetClippingRegion( x, y, width, height ); - + if (!m_window) return; - + GdkRectangle rect; rect.x = XLOG2DEV(x); rect.y = YLOG2DEV(y); @@ -1186,15 +1186,15 @@ void wxWindowDC::DoSetClippingRegion( long x, long y, long width, long height ) void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + if (region.Empty()) { DestroyClippingRegion(); return; } - + if (!m_window) return; - + gdk_gc_set_clip_region( m_penGC, region.GetRegion() ); gdk_gc_set_clip_region( m_brushGC, region.GetRegion() ); gdk_gc_set_clip_region( m_textGC, region.GetRegion() ); @@ -1204,11 +1204,11 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxWindowDC::DestroyClippingRegion() { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxDC::DestroyClippingRegion(); - + if (!m_window) return; - + 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 ); @@ -1224,26 +1224,26 @@ void wxWindowDC::SetUpDC() m_brushGC = gdk_gc_new( m_window ); m_textGC = gdk_gc_new( m_window ); m_bgGC = gdk_gc_new( m_window ); - + wxColour tmp_col( m_textForegroundColour ); m_textForegroundColour = wxNullColour; SetTextForeground( tmp_col ); tmp_col = m_textBackgroundColour; m_textBackgroundColour = wxNullColour; SetTextBackground( tmp_col ); - + wxPen tmp_pen( m_pen ); m_pen = wxNullPen; SetPen( tmp_pen ); - + wxFont tmp_font( m_font ); m_font = wxNullFont; SetFont( tmp_font ); - + wxBrush tmp_brush( m_brush ); m_brush = wxNullBrush; SetBrush( tmp_brush ); - + /* tmp_brush = m_backgroundBrush; m_backgroundBrush = wxNullBrush; @@ -1253,8 +1253,8 @@ void wxWindowDC::SetUpDC() m_backgroundBrush = wxNullBrush; SetBackground( *wxWHITE_BRUSH ); m_backgroundBrush = tmp_brush; - - if (!hatch_bitmap) + + if (!hatch_bitmap) { hatch_bitmap = hatches; hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height ); @@ -1430,7 +1430,7 @@ static void wx_spline_draw_point_array(wxDC *dc) void wxWindowDC::DoDrawSpline( wxList *points ) { wxCHECK_RET( Ok(), _T("invalid window dc") ); - + wxPoint *p; double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; double x1, y1, x2, y2;