Removed redundant code

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 8c447ae4266e3bfad9dc04add64ea32a1b5af054..a778ba23db3c0dfec6e7047f8ce170618b9c1c65 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


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

-

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

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxDC;
-

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

+#ifndef MM_TEXT

 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2


@@ -33,26 +23,63 @@ class wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7

+#endif
+
+//-----------------------------------------------------------------------------
+// coordinates transformations
+//-----------------------------------------------------------------------------
+
+inline wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
+{
+    return wxRound((x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX;
+}
+inline wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
+{
+    return wxRound((y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY;
+}
+inline wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
+{
+    return wxRound(x / m_scaleX);
+}
+inline wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
+{
+    return wxRound(y / m_scaleY);
+}
+inline wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
+{
+    return wxRound((x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX;
+}
+inline wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
+{
+    return wxRound((y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY;
+}
+inline wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
+{
+    return wxRound(x * m_scaleX);
+}
+inline wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
+{
+    return wxRound(y * m_scaleY);
+}

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

-
-    // the first two must be overridden and called
-    virtual void DestroyClippingRegion();
+#endif // wxUSE_PALETTE

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

-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }

     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }
     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }


@@ -65,73 +92,48 @@ public:
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
 
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
 

+    virtual void ComputeScaleAndOrigin();
+
+    virtual GdkWindow* GetGDKWindow() const { return NULL; }
+    virtual wxBitmap GetSelectedBitmap() const { return wxNullBitmap; }        
+
+protected:

     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    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 DeviceToLogicalX(x);

     }
     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 DeviceToLogicalXRel(x);

     }
     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 DeviceToLogicalY(y);

     }
     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 DeviceToLogicalYRel(y);

     }
     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 LogicalToDeviceX(x);

     }
     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 LogicalToDeviceXRel(x);

     }
     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 LogicalToDeviceY(y);

     }
     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 LogicalToDeviceYRel(y);

     }
 
     }
 

-protected:

     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;


@@ -147,9 +149,16 @@ public:
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 

-    
+

 private:
     DECLARE_ABSTRACT_CLASS(wxDC)
 };
 
 private:
     DECLARE_ABSTRACT_CLASS(wxDC)
 };
 

+// this must be defined when wxDC::Blit() honours the DC origian and needed to
+// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK
+// 2.3.[23]
+#ifndef wxHAS_WORKING_GTK_DC_BLIT
+    #define wxHAS_WORKING_GTK_DC_BLIT
+#endif
+

 #endif // __GTKDCH__
 #endif // __GTKDCH__