Map illegal UTF-8 sequences to a range in Unicode's private use area as

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

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 6022c4d72821a6eb0bb52497b1f8fdd3e2357ae4..b020c081bcf72d668ba9cb9cca2f2e98459591c7 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.h
+// Name:        wx/gtk1/dc.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,19 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKDCH__
 #define __GTKDCH__
 
 #ifndef __GTKDCH__
 #define __GTKDCH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDC;
+class WXDLLIMPEXP_CORE wxDC;

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -40,13 +35,15 @@ class wxDC;
 // wxDC
 //-----------------------------------------------------------------------------
 
 // wxDC
 //-----------------------------------------------------------------------------
 

-class wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxDC : public wxDCBase

 {
 public:
     wxDC();
 {
 public:
     wxDC();

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

 
 

+#if wxUSE_PALETTE

     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };

+#endif // wxUSE_PALETTE

 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;


@@ -69,65 +66,39 @@ public:
 
     virtual void ComputeScaleAndOrigin();
 
 
     virtual void ComputeScaleAndOrigin();
 

+    virtual GdkWindow* GetGDKWindow() const { return NULL; }
+

     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);

     }
 
 protected:
     }
 
 protected: