added GetTextExtent() overload returning wxSize (patch 1631508)

[wxWidgets.git] / include / wx / x11 / dc.h

diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h
index 04af891660d457221b44be19a66be7729da206c5..f00e79e833befedffe4816c435225ed9910e7808 100644 (file)
--- a/include/wx/x11/dc.h
+++ b/include/wx/x11/dc.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dc.h"
-#endif
-

 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/icon.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/icon.h"


@@ -45,7 +41,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
 {
 public:
     wxDC();
 {
 public:
     wxDC();

-    ~wxDC() { }
+    virtual ~wxDC() { }

 
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------


@@ -65,67 +61,39 @@ protected:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:

-    void ComputeScaleAndOrigin();
+    virtual void ComputeScaleAndOrigin();

 
     wxCoord XDEV2LOG(wxCoord x) const
     {
 
     wxCoord XDEV2LOG(wxCoord x) const
     {

-        wxCoord new_x = x - m_deviceOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-        else
-            return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
+        return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX;

     }
     wxCoord XDEV2LOGREL(wxCoord x) const
     {
     }
     wxCoord XDEV2LOGREL(wxCoord x) const
     {

-        if (x > 0)
-            return (wxCoord)((double)(x) / m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)(x) / m_scaleX - 0.5);
+        return wxRound((double)(x) / m_scaleX);

     }
     wxCoord YDEV2LOG(wxCoord y) const
     {
     }
     wxCoord YDEV2LOG(wxCoord y) const
     {

-        wxCoord new_y = y - m_deviceOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-        else
-            return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
+        return wxRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY;

     }
     wxCoord YDEV2LOGREL(wxCoord y) const
     {
     }
     wxCoord YDEV2LOGREL(wxCoord y) const
     {

-        if (y > 0)
-            return (wxCoord)((double)(y) / m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)(y) / m_scaleY - 0.5);
+        return wxRound((double)(y) / m_scaleY);

     }
     wxCoord XLOG2DEV(wxCoord x) const
     {
     }
     wxCoord XLOG2DEV(wxCoord x) const
     {

-        wxCoord new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-        else
-            return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
+        return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX;

     }
     wxCoord XLOG2DEVREL(wxCoord x) const
     {
     }
     wxCoord XLOG2DEVREL(wxCoord x) const
     {

-        if (x > 0)
-            return (wxCoord)((double)(x) * m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)(x) * m_scaleX - 0.5);
+        return wxRound((double)(x) * m_scaleX);

     }
     wxCoord YLOG2DEV(wxCoord y) const
     {
     }
     wxCoord YLOG2DEV(wxCoord y) const
     {

-        wxCoord new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-        else
-            return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
+        return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY;

     }
     wxCoord YLOG2DEVREL(wxCoord y) const
     {
     }
     wxCoord YLOG2DEVREL(wxCoord y) const
     {

-        if (y > 0)
-            return (wxCoord)((double)(y) * m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)(y) * m_scaleY - 0.5);
+        return wxRound((double)(y) * m_scaleY);

     }
 
 public:
     }
 
 public: