replaced another printf() with wxLogDebug()

[wxWidgets.git] / src / gtk / dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 520eaa70365c9d2ef1def78e1070bb9caa934dd2..2b2cc3d3a3cdc085b0925fe4b94b16f72cf2669c 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -92,7 +92,7 @@ wxPaintDC::wxPaintDC(void)
   m_textGC = NULL;
   m_bgGC = NULL;
   m_cmap = NULL;
   m_textGC = NULL;
   m_bgGC = NULL;
   m_cmap = NULL;

-};
+}

 
 wxPaintDC::wxPaintDC( wxWindow *window )
 {
 
 wxPaintDC::wxPaintDC( wxWindow *window )
 {


@@ -115,26 +115,21 @@ wxPaintDC::wxPaintDC( wxWindow *window )
   m_isDrawable = TRUE;
         
   SetUpDC();
   m_isDrawable = TRUE;
         
   SetUpDC();

-  
-  long x = 0;
-  long y = 0;
-  window->GetDrawingOffset( &x, &y );
-  SetInternalDeviceOrigin( -x, -y );
-};
+}

 
 wxPaintDC::~wxPaintDC(void)
 {
 
 wxPaintDC::~wxPaintDC(void)
 {

-};
+}

 
 void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 
   wxColour *WXUNUSED(col), int WXUNUSED(style) )
 {
 
 void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 
   wxColour *WXUNUSED(col), int WXUNUSED(style) )
 {

-};
+}

 
 bool wxPaintDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const
 {
   return FALSE;
 
 bool wxPaintDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const
 {
   return FALSE;

-};
+}

 
 void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 )
 {
 
 void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 )
 {


@@ -144,8 +139,8 @@ void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 )
   {
     gdk_draw_line( m_window, m_penGC, 
       XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );
   {
     gdk_draw_line( m_window, m_penGC, 
       XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );

-  };
-};
+  }
+}

 
 void wxPaintDC::CrossHair( long x, long y )
 {
 
 void wxPaintDC::CrossHair( long x, long y )
 {


@@ -162,8 +157,8 @@ void wxPaintDC::CrossHair( long x, long y )
       0, yy, XLOG2DEVREL(w), yy );
     gdk_draw_line( m_window, m_penGC,
       xx, 0, xx, YLOG2DEVREL(h) );
       0, yy, XLOG2DEVREL(w), yy );
     gdk_draw_line( m_window, m_penGC,
       xx, 0, xx, YLOG2DEVREL(h) );

-  };
-};
+  }
+}

 
 void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc )
 {
 
 void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc )
 {


@@ -199,7 +194,7 @@ void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double y
     radius2 = (xx2 - xxc == 0) ?
            (yy2 - yyc < 0) ? 90.0 : -90.0 :
            -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
     radius2 = (xx2 - xxc == 0) ?
            (yy2 - yyc < 0) ? 90.0 : -90.0 :
            -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;

-  };
+  }

   long alpha1 = long(radius1 * 64.0);
   long alpha2 = long((radius2 - radius1) * 64.0);
   while (alpha2 <= 0) alpha2 += 360*64;
   long alpha1 = long(radius1 * 64.0);
   long alpha2 = long((radius2 - radius1) * 64.0);
   while (alpha2 <= 0) alpha2 += 360*64;


@@ -211,7 +206,7 @@ void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double y
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_arc( m_window, m_penGC, FALSE, 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 );
   

-};
+}

 
 void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea )
 {
 
 void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea )
 {


@@ -233,7 +228,7 @@ void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double
   
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_arc( m_window, m_penGC, FALSE, 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 );

-};
+}

 
 void wxPaintDC::DrawPoint( long x, long y )
 {
 
 void wxPaintDC::DrawPoint( long x, long y )
 {


@@ -241,7 +236,7 @@ void wxPaintDC::DrawPoint( long x, long y )
   
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
   
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );

-};
+}

 
 void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
 {
 
 void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
 {


@@ -256,8 +251,8 @@ void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
     long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
     long y2 = YLOG2DEV(points[i+1].y + yoffset);
     gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
     long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
     long y2 = YLOG2DEV(points[i+1].y + yoffset);
     gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );

-  };
-};
+  }
+}

 
 void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
 {
 
 void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
 {


@@ -276,20 +271,66 @@ void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
     long y2 = YLOG2DEV(npoint->y + yoffset);
     gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
     node = node->Next();
     long y2 = YLOG2DEV(npoint->y + yoffset);
     gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
     node = node->Next();

-  };
-};
+  }
+}

 
 

-void wxPaintDC::DrawPolygon( int WXUNUSED(n), wxPoint WXUNUSED(points)[], 
-  long WXUNUSED(xoffset), long WXUNUSED(yoffset), int WXUNUSED(fillStyle) )
-{
-  if (!Ok()) return;
-};
+void wxPaintDC::DrawPolygon( int n, wxPoint points[], 
+  long xoffset, long yoffset, int WXUNUSED(fillStyle) )
+ {
+   if (!Ok()) return;
+   if (!n) return;    // Nothing to draw
+   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);
+     }
+   if (m_brush.GetStyle() != wxTRANSPARENT)
+     gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n);
+   // To do: Fillstyle
+   if (m_pen.GetStyle() != wxTRANSPARENT)
+     for (i = 0 ; i < n ; i++)
+       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;
+}

 
 

-void wxPaintDC::DrawPolygon( wxList *WXUNUSED(lines), long WXUNUSED(xoffset), 
-                             long WXUNUSED(yoffset), int WXUNUSED(fillStyle) )
-{
-  if (!Ok()) return;
-};
+void wxPaintDC::DrawPolygon( wxList *lines, long xoffset, 
+                              long yoffset, int WXUNUSED(fillStyle))
+ {
+   int n = lines->Number();
+ 
+   if (!Ok()) return;
+   GdkPoint *gdkpoints = new GdkPoint[n];
+   wxNode *node = lines->First();
+   int cnt=0;
+   while (node)
+     {
+       wxPoint *p = (wxPoint *) node->Data();
+       gdkpoints[cnt].x = XLOG2DEV(p->x + xoffset);
+       gdkpoints[cnt].y = YLOG2DEV(p->y + yoffset);
+       node = node->Next();
+       cnt++;
+     }
+   if (m_brush.GetStyle() != wxTRANSPARENT)
+     gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n);
+   // To do: Fillstyle
+   if (m_pen.GetStyle() != wxTRANSPARENT)
+     {
+       int i;
+       for (i = 0 ; i < n ; i++)
+       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;
+}

 
 void wxPaintDC::DrawRectangle( long x, long y, long width, long height )
 {
 
 void wxPaintDC::DrawRectangle( long x, long y, long width, long height )
 {


@@ -312,7 +353,7 @@ void wxPaintDC::DrawRectangle( long x, long y, long width, long height )
     
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
     
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );

-};
+}

 
 void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius )
 {
 
 void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius )
 {


@@ -364,7 +405,7 @@ void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, d
     gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
     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 );
     gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
     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)
   {
   
   if (m_pen.GetStyle() != wxTRANSPARENT)
   {


@@ -376,8 +417,8 @@ void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, d
     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 );
     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 );

-  };
-};
+  }
+}

 
 void wxPaintDC::DrawEllipse( long x, long y, long width, long height )
 {
 
 void wxPaintDC::DrawEllipse( long x, long y, long width, long height )
 {


@@ -397,12 +438,12 @@ void wxPaintDC::DrawEllipse( long x, long y, long width, long height )
   
   if (m_pen.GetStyle() != wxTRANSPARENT)
     gdk_draw_arc( m_window, m_penGC, FALSE, 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 );

-};
+}

 
 bool wxPaintDC::CanDrawBitmap(void) const
 {
   return TRUE;
 
 bool wxPaintDC::CanDrawBitmap(void) const
 {
   return TRUE;

-};
+}

 
 void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
 {
 
 void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
 {


@@ -420,7 +461,7 @@ void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
   {
     gdk_gc_set_clip_mask( m_penGC, mask );
     gdk_gc_set_clip_origin( m_penGC, xx, yy );
   {
     gdk_gc_set_clip_mask( m_penGC, mask );
     gdk_gc_set_clip_origin( m_penGC, xx, yy );

-  };
+  }

   
   GdkPixmap *pm = icon.GetPixmap();
   gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
   
   GdkPixmap *pm = icon.GetPixmap();
   gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );


@@ -429,8 +470,8 @@ void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
   {
     gdk_gc_set_clip_mask( m_penGC, NULL );
     gdk_gc_set_clip_origin( m_penGC, 0, 0 );
   {
     gdk_gc_set_clip_mask( m_penGC, NULL );
     gdk_gc_set_clip_origin( m_penGC, 0, 0 );

-  };
-};
+  }
+}

 
 bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
        wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) )
 
 bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
        wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) )


@@ -472,10 +513,9 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
 */
     
   return TRUE;
 */
     
   return TRUE;

-};
+}

 
 

-void wxPaintDC::DrawText( const wxString &text, long x, long y, bool
-WXUNUSED(use16) )
+void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(use16) )

 {
   if (!Ok()) return;
 
 {
   if (!Ok()) return;
 


@@ -505,41 +545,44 @@ WXUNUSED(use16) )
     if (font->descent > 0) ul_y++;
     gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
   }
     if (font->descent > 0) ul_y++;
     gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
   }

-};
-
-
+}

 
 bool wxPaintDC::CanGetTextExtent(void) const
 {
   return TRUE;
 
 bool wxPaintDC::CanGetTextExtent(void) const
 {
   return TRUE;

-};
+}

 
 void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height,
 
 void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height,

-                     long *WXUNUSED(descent), long *WXUNUSED(externalLeading),
-                     wxFont *WXUNUSED(theFont), bool WXUNUSED(use16) )
+                     long *descent, long *externalLeading,
+                     wxFont *theFont, bool WXUNUSED(use16) )

 {
   if (!Ok()) return;
   
 {
   if (!Ok()) return;
   

-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
+  wxFont fontToUse = m_font;
+  if (theFont) fontToUse = *theFont;
+  
+  GdkFont *font = fontToUse.GetInternalFont( m_scaleY );

   if (width) (*width) = long(gdk_string_width( font, string ) / m_scaleX);
   if (height) (*height) = long((font->ascent + font->descent) / m_scaleY);
   if (width) (*width) = long(gdk_string_width( font, string ) / m_scaleX);
   if (height) (*height) = long((font->ascent + font->descent) / m_scaleY);

-};
+  if (descent) (*descent) = long(font->descent / m_scaleY);
+  if (externalLeading) (*externalLeading) = 0;  // ??
+}

 
 long wxPaintDC::GetCharWidth(void)
 {
   if (!Ok()) return 0;
   
   GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
 long wxPaintDC::GetCharWidth(void)
 {
   if (!Ok()) return 0;
   
   GdkFont *font = m_font.GetInternalFont( m_scaleY );

-  return gdk_string_width( font, "H" );
-};
+  return long(gdk_string_width( font, "H" ) / m_scaleX);
+}

 
 long wxPaintDC::GetCharHeight(void)
 {
   if (!Ok()) return 0;
   
   GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
 long wxPaintDC::GetCharHeight(void)
 {
   if (!Ok()) return 0;
   
   GdkFont *font = m_font.GetInternalFont( m_scaleY );

-  return font->ascent + font->descent;
-};
+  return long((font->ascent + font->descent) / m_scaleY);
+}

 
 void wxPaintDC::Clear(void)
 {
 
 void wxPaintDC::Clear(void)
 {


@@ -557,15 +600,15 @@ void wxPaintDC::Clear(void)
     int height = 0;
     GetSize( &width, &height );
     gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
     int height = 0;
     GetSize( &width, &height );
     gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );

-  };
-};
+  }
+}

 
 void wxPaintDC::SetFont( const wxFont &font )
 {
   if (!Ok()) return;
   
   m_font = font;
 
 void wxPaintDC::SetFont( const wxFont &font )
 {
   if (!Ok()) return;
   
   m_font = font;

-};
+}

 
 void wxPaintDC::SetPen( const wxPen &pen )
 {
 
 void wxPaintDC::SetPen( const wxPen &pen )
 {


@@ -594,34 +637,34 @@ void wxPaintDC::SetPen( const wxPen &pen )
   GdkLineStyle lineStyle = GDK_LINE_SOLID;
   switch (m_pen.GetStyle())
   {
   GdkLineStyle lineStyle = GDK_LINE_SOLID;
   switch (m_pen.GetStyle())
   {

-    case wxSOLID:      { lineStyle = GDK_LINE_SOLID;       break; };
-    case wxDOT:        { lineStyle = GDK_LINE_ON_OFF_DASH; break; };
-    case wxLONG_DASH:  { lineStyle = GDK_LINE_ON_OFF_DASH; break; };
-    case wxSHORT_DASH: { lineStyle = GDK_LINE_ON_OFF_DASH; break; };
-    case wxDOT_DASH:   { lineStyle = GDK_LINE_DOUBLE_DASH; break; };
-  };
+    case wxSOLID:      { lineStyle = GDK_LINE_SOLID;       break; }
+    case wxDOT:        { lineStyle = GDK_LINE_ON_OFF_DASH; break; }
+    case wxLONG_DASH:  { lineStyle = GDK_LINE_ON_OFF_DASH; break; }
+    case wxSHORT_DASH: { lineStyle = GDK_LINE_ON_OFF_DASH; break; }
+    case wxDOT_DASH:   { lineStyle = GDK_LINE_DOUBLE_DASH; break; }
+  }

   
   GdkCapStyle capStyle = GDK_CAP_ROUND;
   switch (m_pen.GetCap())
   {
   
   GdkCapStyle capStyle = GDK_CAP_ROUND;
   switch (m_pen.GetCap())
   {

-    case wxCAP_ROUND:      { capStyle = (width <= 1) ? GDK_CAP_NOT_LAST : GDK_CAP_ROUND; break; };
-    case wxCAP_PROJECTING: { capStyle = GDK_CAP_PROJECTING; break; };
-    case wxCAP_BUTT:       { capStyle = GDK_CAP_BUTT;       break; };
-  };
+    case wxCAP_ROUND:      { capStyle = (width <= 1) ? GDK_CAP_NOT_LAST : GDK_CAP_ROUND; break; }
+    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())
   {
   
   GdkJoinStyle joinStyle = GDK_JOIN_ROUND;
   switch (m_pen.GetJoin())
   {

-    case wxJOIN_BEVEL: { joinStyle = GDK_JOIN_BEVEL; break; };
-    case wxJOIN_ROUND: { joinStyle = GDK_JOIN_ROUND; break; };
-    case wxJOIN_MITER: { joinStyle = GDK_JOIN_MITER; break; };
-  };
+    case wxJOIN_BEVEL: { joinStyle = GDK_JOIN_BEVEL; break; }
+    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() );
   
   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() );

-};
+}

 
 void wxPaintDC::SetBrush( const wxBrush &brush )
 {
 
 void wxPaintDC::SetBrush( const wxBrush &brush )
 {


@@ -644,21 +687,21 @@ void wxPaintDC::SetBrush( const wxBrush &brush )
       break;
     default:
       fillStyle = GDK_STIPPLED;
       break;
     default:
       fillStyle = GDK_STIPPLED;

-  };
+  }

  
   gdk_gc_set_fill( m_brushGC, fillStyle );
   
   if (m_brush.GetStyle() == wxSTIPPLE)
   {
     gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
  
   gdk_gc_set_fill( m_brushGC, fillStyle );
   
   if (m_brush.GetStyle() == wxSTIPPLE)
   {
     gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );

-  };
+  }

   
   if (IS_HATCH(m_brush.GetStyle()))
   {
     int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
     gdk_gc_set_stipple( m_brushGC, hatches[num] );
   
   if (IS_HATCH(m_brush.GetStyle()))
   {
     int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
     gdk_gc_set_stipple( m_brushGC, hatches[num] );

-  };
-};
+  }
+}

 
 // CMB 21/7/98: Added SetBackground. Sets background brush
 // for Clear() and bg colour for shapes filled with cross-hatch brush
 
 // CMB 21/7/98: Added SetBackground. Sets background brush
 // for Clear() and bg colour for shapes filled with cross-hatch brush


@@ -684,21 +727,21 @@ void wxPaintDC::SetBackground( const wxBrush &brush )
       break;
     default:
       fillStyle = GDK_STIPPLED;
       break;
     default:
       fillStyle = GDK_STIPPLED;

-  };
+  }

  
   gdk_gc_set_fill( m_bgGC, fillStyle );
   
   if (m_backgroundBrush.GetStyle() == wxSTIPPLE)
   {
     gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
  
   gdk_gc_set_fill( m_bgGC, fillStyle );
   
   if (m_backgroundBrush.GetStyle() == wxSTIPPLE)
   {
     gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );

-  };
+  }

   
   if (IS_HATCH(m_backgroundBrush.GetStyle()))
   {
     int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
     gdk_gc_set_stipple( m_bgGC, hatches[num] );
   
   if (IS_HATCH(m_backgroundBrush.GetStyle()))
   {
     int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
     gdk_gc_set_stipple( m_bgGC, hatches[num] );

-  };
-};
+  }
+}

 
 void wxPaintDC::SetLogicalFunction( int function )
 {
 
 void wxPaintDC::SetLogicalFunction( int function )
 {


@@ -709,11 +752,11 @@ void wxPaintDC::SetLogicalFunction( int function )
     case wxXOR:    mode = GDK_INVERT; break;
     case wxINVERT: mode = GDK_INVERT; break;
     default:       break;
     case wxXOR:    mode = GDK_INVERT; break;
     case wxINVERT: mode = GDK_INVERT; break;
     default:       break;

-  };
+  }

   m_logicalFunction = function;
   gdk_gc_set_function( m_penGC, mode );
   gdk_gc_set_function( m_brushGC, mode );
   m_logicalFunction = function;
   gdk_gc_set_function( m_penGC, mode );
   gdk_gc_set_function( m_brushGC, mode );

-};
+}

 
 void wxPaintDC::SetTextForeground( const wxColour &col )
 {
 
 void wxPaintDC::SetTextForeground( const wxColour &col )
 {


@@ -726,7 +769,7 @@ void wxPaintDC::SetTextForeground( const wxColour &col )
   
   m_textForegroundColour.CalcPixel( m_cmap );
   gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
   
   m_textForegroundColour.CalcPixel( m_cmap );
   gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );

-};
+}

 
 void wxPaintDC::SetTextBackground( const wxColour &col )
 {
 
 void wxPaintDC::SetTextBackground( const wxColour &col )
 {


@@ -739,7 +782,7 @@ void wxPaintDC::SetTextBackground( const wxColour &col )
   
   m_textBackgroundColour.CalcPixel( m_cmap );
   gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
   
   m_textBackgroundColour.CalcPixel( m_cmap );
   gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );

-};
+}

 
 void wxPaintDC::SetBackgroundMode( int mode )
 {
 
 void wxPaintDC::SetBackgroundMode( int mode )
 {


@@ -752,11 +795,11 @@ void wxPaintDC::SetBackgroundMode( int mode )
     gdk_gc_set_fill( m_brushGC,
       (m_backgroundMode == wxTRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
   }
     gdk_gc_set_fill( m_brushGC,
       (m_backgroundMode == wxTRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
   }

-};
+}

 
 void wxPaintDC::SetPalette( const wxPalette& WXUNUSED(palette) )
 {
 
 void wxPaintDC::SetPalette( const wxPalette& WXUNUSED(palette) )
 {

-};
+}

 
 void wxPaintDC::SetClippingRegion( long x, long y, long width, long height )
 {
 
 void wxPaintDC::SetClippingRegion( long x, long y, long width, long height )
 {


@@ -765,14 +808,14 @@ void wxPaintDC::SetClippingRegion( long x, long y, long width, long height )
   GdkRectangle rect;
   rect.x = XLOG2DEV(x);
   rect.y = YLOG2DEV(y);
   GdkRectangle rect;
   rect.x = XLOG2DEV(x);
   rect.y = YLOG2DEV(y);

-  rect.width = XLOG2DEV(x+width);
-  rect.height = YLOG2DEV(y+height);
+  rect.width = XLOG2DEVREL(width);
+  rect.height = YLOG2DEVREL(height);

   gdk_gc_set_clip_rectangle( m_penGC, &rect );
   gdk_gc_set_clip_rectangle( m_brushGC, &rect );
   gdk_gc_set_clip_rectangle( m_textGC, &rect );
   gdk_gc_set_clip_rectangle( m_bgGC, &rect );
   
   gdk_gc_set_clip_rectangle( m_penGC, &rect );
   gdk_gc_set_clip_rectangle( m_brushGC, &rect );
   gdk_gc_set_clip_rectangle( m_textGC, &rect );
   gdk_gc_set_clip_rectangle( m_bgGC, &rect );
   

-};
+}

 
 void wxPaintDC::DestroyClippingRegion(void)
 {
 
 void wxPaintDC::DestroyClippingRegion(void)
 {


@@ -782,7 +825,7 @@ void wxPaintDC::DestroyClippingRegion(void)
   gdk_gc_set_clip_rectangle( m_brushGC, NULL );
   gdk_gc_set_clip_rectangle( m_textGC, NULL );
   gdk_gc_set_clip_rectangle( m_bgGC, NULL );
   gdk_gc_set_clip_rectangle( m_brushGC, NULL );
   gdk_gc_set_clip_rectangle( m_textGC, NULL );
   gdk_gc_set_clip_rectangle( m_bgGC, NULL );

-};
+}

 
 void wxPaintDC::SetUpDC(void)
 {
 
 void wxPaintDC::SetUpDC(void)
 {


@@ -813,13 +856,13 @@ void wxPaintDC::SetUpDC(void)
     hatch_bitmap[3] = gdk_bitmap_create_from_data( NULL, cross_bits, cross_width, cross_height );
     hatch_bitmap[4] = gdk_bitmap_create_from_data( NULL, horiz_bits, horiz_width, horiz_height );
     hatch_bitmap[5] = gdk_bitmap_create_from_data( NULL, verti_bits, verti_width, verti_height );
     hatch_bitmap[3] = gdk_bitmap_create_from_data( NULL, cross_bits, cross_width, cross_height );
     hatch_bitmap[4] = gdk_bitmap_create_from_data( NULL, horiz_bits, horiz_width, horiz_height );
     hatch_bitmap[5] = gdk_bitmap_create_from_data( NULL, verti_bits, verti_width, verti_height );

-  };
-};
+  }
+}

 
 GdkWindow *wxPaintDC::GetWindow(void)
 {
   return m_window;
 
 GdkWindow *wxPaintDC::GetWindow(void)
 {
   return m_window;

-};
+}

 
 // ----------------------------------- spline code ----------------------------------------
 
 
 // ----------------------------------- spline code ----------------------------------------
 


@@ -984,4 +1027,4 @@ void wxPaintDC::DrawOpenSpline( wxList *points )
     wx_spline_add_point( x2, y2 );
 
     wx_spline_draw_point_array( this );
     wx_spline_add_point( x2, y2 );
 
     wx_spline_draw_point_array( this );

-};
+}