fix for crash when using user-dashed lines (patch 801663)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index af3b8bbe6feedd83896d2a5febe3a7ddc2c410dc..2e22f469821a3355b6f10119555e5e80691f5a8b 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -66,6 +66,7 @@ wxMSW:
 wxGTK:
 
 - fixes to wxTextCtrl scrolling under GTK2 (Nerijus Baliunas)
+- fix for crash when using user-dashed lines (Chris Borgolte)
 
 
 2.5.0

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 47c3ec21743280d65a921ed0d5d1e4c6342056ef..92ae53ff9d9b6af8ce7754fb08d46ec8733c45aa 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1838,6 +1838,12 @@ void wxWindowDC::SetPen( const wxPen &pen )
                    ( fabs((double) XLOG2DEVREL(width)) +
                      fabs((double) YLOG2DEVREL(width)) ) / 2.0;
         width = (int)w;
+        if ( !width )
+        {
+            // width can't be 0 or an internal GTK error occurs inside
+            // gdk_gc_set_dashes() below
+            width = 1;
+        }
     }
 
     static const wxGTKDash dotted[] = {1, 1};

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 47c3ec21743280d65a921ed0d5d1e4c6342056ef..92ae53ff9d9b6af8ce7754fb08d46ec8733c45aa 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1838,6 +1838,12 @@ void wxWindowDC::SetPen( const wxPen &pen )
                    ( fabs((double) XLOG2DEVREL(width)) +
                      fabs((double) YLOG2DEVREL(width)) ) / 2.0;
         width = (int)w;
+        if ( !width )
+        {
+            // width can't be 0 or an internal GTK error occurs inside
+            // gdk_gc_set_dashes() below
+            width = 1;
+        }
     }
 
     static const wxGTKDash dotted[] = {1, 1};