projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Smooth Aqua buttons in wxTreeCtrl.
[wxWidgets.git]
/
src
/
gtk1
/
dc.cpp
diff --git
a/src/gtk1/dc.cpp
b/src/gtk1/dc.cpp
index 57c1f336a796432cc9aa3d51a50e6a48e43377c5..46ea5626c490821d5fe286b97c78456ae55343c8 100644
(file)
--- a/
src/gtk1/dc.cpp
+++ b/
src/gtk1/dc.cpp
@@
-14,8
+14,8
@@
#include "wx/dc.h"
#include "wx/dc.h"
-#include
"gdk/gdk.h"
-#include
"gtk/gtk.h"
+#include
<gdk/gdk.h>
+#include
<gtk/gtk.h>
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
// constants
@@
-38,8
+38,10
@@
wxDC::wxDC()
{
m_ok = FALSE;
{
m_ok = FALSE;
- m_mm_to_pix_x = 1.0;
- m_mm_to_pix_y = 1.0;
+ m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() /
+ (double)wxGetDisplaySizeMM().GetWidth();
+ m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
+ (double)wxGetDisplaySizeMM().GetHeight();
m_needComputeScaleX = FALSE; /* not used yet */
m_needComputeScaleY = FALSE; /* not used yet */
m_needComputeScaleX = FALSE; /* not used yet */
m_needComputeScaleY = FALSE; /* not used yet */
@@
-48,10
+50,10
@@
wxDC::wxDC()
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
- m_brush = *wx
TRANSPARENT
_BRUSH;
+ m_brush = *wx
WHITE
_BRUSH;
}
}
-void wxDC::DoSetClippingRegion(
long x, long y, long width, long
height )
+void wxDC::DoSetClippingRegion(
wxCoord x, wxCoord y, wxCoord width, wxCoord
height )
{
m_clipping = TRUE;
m_clipX1 = x;
{
m_clipping = TRUE;
m_clipX1 = x;
@@
-69,19
+71,13
@@
void wxDC::DestroyClippingRegion()
// get DC capabilities
// ---------------------------------------------------------------------------
// get DC capabilities
// ---------------------------------------------------------------------------
-void wxDC::DoGetSize( int* width, int* height ) const
-{
- if (width) *width = m_maxX-m_minX;
- if (height) *height = m_maxY-m_minY;
-}
-
void wxDC::DoGetSizeMM( int* width, int* height ) const
{
int w = 0;
int h = 0;
GetSize( &w, &h );
void wxDC::DoGetSizeMM( int* width, int* height ) const
{
int w = 0;
int h = 0;
GetSize( &w, &h );
- if (width) *width = int( double(w) / (m_
s
caleX*m_mm_to_pix_x) );
- if (height) *height = int( double(h) / (m_
s
caleY*m_mm_to_pix_y) );
+ if (width) *width = int( double(w) / (m_
userS
caleX*m_mm_to_pix_x) );
+ if (height) *height = int( double(h) / (m_
userS
caleY*m_mm_to_pix_y) );
}
// Resolution in pixels per logical inch
}
// Resolution in pixels per logical inch
@@
-149,14
+145,14
@@
void wxDC::SetLogicalScale( double x, double y )
ComputeScaleAndOrigin();
}
ComputeScaleAndOrigin();
}
-void wxDC::SetLogicalOrigin(
long x, long
y )
+void wxDC::SetLogicalOrigin(
wxCoord x, wxCoord
y )
{
m_logicalOriginX = x * m_signX; // is this still correct ?
m_logicalOriginY = y * m_signY;
ComputeScaleAndOrigin();
}
{
m_logicalOriginX = x * m_signX; // is this still correct ?
m_logicalOriginY = y * m_signY;
ComputeScaleAndOrigin();
}
-void wxDC::SetDeviceOrigin(
long x, long
y )
+void wxDC::SetDeviceOrigin(
wxCoord x, wxCoord
y )
{
// only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
m_deviceOriginX = x;
{
// only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
m_deviceOriginX = x;
@@
-176,42
+172,42
@@
void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
// coordinates transformations
// ---------------------------------------------------------------------------
// coordinates transformations
// ---------------------------------------------------------------------------
-
long wxDCBase::DeviceToLogicalX(long
x) const
+
wxCoord wxDCBase::DeviceToLogicalX(wxCoord
x) const
{
return ((wxDC *)this)->XDEV2LOG(x);
}
{
return ((wxDC *)this)->XDEV2LOG(x);
}
-
long wxDCBase::DeviceToLogicalY(long
y) const
+
wxCoord wxDCBase::DeviceToLogicalY(wxCoord
y) const
{
return ((wxDC *)this)->YDEV2LOG(y);
}
{
return ((wxDC *)this)->YDEV2LOG(y);
}
-
long wxDCBase::DeviceToLogicalXRel(long
x) const
+
wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord
x) const
{
return ((wxDC *)this)->XDEV2LOGREL(x);
}
{
return ((wxDC *)this)->XDEV2LOGREL(x);
}
-
long wxDCBase::DeviceToLogicalYRel(long
y) const
+
wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord
y) const
{
return ((wxDC *)this)->YDEV2LOGREL(y);
}
{
return ((wxDC *)this)->YDEV2LOGREL(y);
}
-
long wxDCBase::LogicalToDeviceX(long
x) const
+
wxCoord wxDCBase::LogicalToDeviceX(wxCoord
x) const
{
return ((wxDC *)this)->XLOG2DEV(x);
}
{
return ((wxDC *)this)->XLOG2DEV(x);
}
-
long wxDCBase::LogicalToDeviceY(long
y) const
+
wxCoord wxDCBase::LogicalToDeviceY(wxCoord
y) const
{
return ((wxDC *)this)->YLOG2DEV(y);
}
{
return ((wxDC *)this)->YLOG2DEV(y);
}
-
long wxDCBase::LogicalToDeviceXRel(long
x) const
+
wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord
x) const
{
return ((wxDC *)this)->XLOG2DEVREL(x);
}
{
return ((wxDC *)this)->XLOG2DEVREL(x);
}
-
long wxDCBase::LogicalToDeviceYRel(long
y) const
+
wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord
y) const
{
return ((wxDC *)this)->YLOG2DEVREL(y);
}
{
return ((wxDC *)this)->YLOG2DEVREL(y);
}