corrected the bad patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
#include "wx/dcclient.h"
|
#include "wx/dcclient.h"
|
||||||
#include "wx/dcmemory.h"
|
#include "wx/dcmemory.h"
|
||||||
#include "wx/image.h"
|
#include "wx/image.h"
|
||||||
#include <math.h>
|
#include <math.h> // for floating-point functions
|
||||||
|
|
||||||
#include "gdk/gdk.h"
|
#include "gdk/gdk.h"
|
||||||
#include "gtk/gtk.h"
|
#include "gtk/gtk.h"
|
||||||
@@ -874,7 +874,9 @@ void wxWindowDC::SetPen( const wxPen &pen )
|
|||||||
{
|
{
|
||||||
// X doesn't allow different width in x and y and so we take
|
// X doesn't allow different width in x and y and so we take
|
||||||
// the average
|
// the average
|
||||||
double w = 0.5 + (abs((double) XLOG2DEVREL(width)) + abs((double) YL2DEVREL(width))) / 2.0;
|
double w = 0.5 +
|
||||||
|
( fabs((double) XLOG2DEVREL(width)) +
|
||||||
|
fabs((double) YLOG2DEVREL(width)) ) / 2.0;
|
||||||
width = (int)w;
|
width = (int)w;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
#include "wx/dcclient.h"
|
#include "wx/dcclient.h"
|
||||||
#include "wx/dcmemory.h"
|
#include "wx/dcmemory.h"
|
||||||
#include "wx/image.h"
|
#include "wx/image.h"
|
||||||
#include <math.h>
|
#include <math.h> // for floating-point functions
|
||||||
|
|
||||||
#include "gdk/gdk.h"
|
#include "gdk/gdk.h"
|
||||||
#include "gtk/gtk.h"
|
#include "gtk/gtk.h"
|
||||||
@@ -874,7 +874,9 @@ void wxWindowDC::SetPen( const wxPen &pen )
|
|||||||
{
|
{
|
||||||
// X doesn't allow different width in x and y and so we take
|
// X doesn't allow different width in x and y and so we take
|
||||||
// the average
|
// the average
|
||||||
double w = 0.5 + (abs((double) XLOG2DEVREL(width)) + abs((double) YL2DEVREL(width))) / 2.0;
|
double w = 0.5 +
|
||||||
|
( fabs((double) XLOG2DEVREL(width)) +
|
||||||
|
fabs((double) YLOG2DEVREL(width)) ) / 2.0;
|
||||||
width = (int)w;
|
width = (int)w;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user