X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f98bd6d6cf33f0475b5d737a2968b42b7ea0009f..82bbd8907b6a5f4e476f8d9075afb6bef203a165:/include/wx/gtk/dc.h

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index a778ba23db..d19fbdc1d2 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -10,67 +10,27 @@
 #ifndef __GTKDCH__
 #define __GTKDCH__
 
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#ifndef MM_TEXT
-#define MM_TEXT         0
-#define MM_ISOTROPIC    1
-#define MM_ANISOTROPIC  2
-#define MM_LOMETRIC     3
-#define MM_HIMETRIC     4
-#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
 //-----------------------------------------------------------------------------
 
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKImplDC : public wxImplDC
+#else
+#define wxGTKImplDC wxDC
 class WXDLLIMPEXP_CORE wxDC : public wxDCBase
+#endif
+
 {
 public:
+#if wxUSE_NEW_DC
+    wxGTKImplDC( wxDC *owner );
+#else
     wxDC();
-    virtual ~wxDC() { }
+#endif
+
+    virtual ~wxGTKImplDC();
 
 #if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
@@ -84,74 +44,15 @@ public:
     virtual void StartPage() { }
     virtual void EndPage() { }
 
-    virtual void SetMapMode( int mode );
-    virtual void SetUserScale( double x, double y );
-    virtual void SetLogicalScale( double x, double y );
-    virtual void SetLogicalOrigin( wxCoord x, wxCoord y );
-    virtual void SetDeviceOrigin( wxCoord x, wxCoord y );
-
-    virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-
-    virtual void ComputeScaleAndOrigin();
-
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
-    virtual wxBitmap GetSelectedBitmap() const { return wxNullBitmap; }        
 
 protected:
-    // implementation
-    // --------------
-
-    wxCoord XDEV2LOG(wxCoord x) const
-    {
-        return DeviceToLogicalX(x);
-    }
-    wxCoord XDEV2LOGREL(wxCoord x) const
-    {
-        return DeviceToLogicalXRel(x);
-    }
-    wxCoord YDEV2LOG(wxCoord y) const
-    {
-        return DeviceToLogicalY(y);
-    }
-    wxCoord YDEV2LOGREL(wxCoord y) const
-    {
-        return DeviceToLogicalYRel(y);
-    }
-    wxCoord XLOG2DEV(wxCoord x) const
-    {
-        return LogicalToDeviceX(x);
-    }
-    wxCoord XLOG2DEVREL(wxCoord x) const
-    {
-        return LogicalToDeviceXRel(x);
-    }
-    wxCoord YLOG2DEV(wxCoord y) const
-    {
-        return LogicalToDeviceY(y);
-    }
-    wxCoord YLOG2DEVREL(wxCoord y) const
-    {
-        return LogicalToDeviceYRel(y);
-    }
-
     // 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;
 
-public:
-    // GTK-specific member variables
-
-    // not sure what for, but what is a mm on a screen you don't know the size
-    // of?
-    double       m_mm_to_pix_x,
-                 m_mm_to_pix_y;
-
-    bool         m_needComputeScaleX,
-                 m_needComputeScaleY; // not yet used
-
-
 private:
-    DECLARE_ABSTRACT_CLASS(wxDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKImplDC)
 };
 
 // this must be defined when wxDC::Blit() honours the DC origian and needed to