X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72cdf4c9b3ce92addf09cfb322f0c19bfb0f8744..c00fed0ef4d70c9b45d9b8405f636d30eadb7ea6:/src/gtk1/dc.cpp?ds=sidebyside

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 489a2f102e..80d08c5b01 100644
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -3,30 +3,17 @@
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
-    #pragma implementation "dc.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/dc.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxDC
@@ -38,8 +25,10 @@ wxDC::wxDC()
 {
     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 */
@@ -60,28 +49,17 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
     m_clipY2 = y + height;
 }
 
-void wxDC::DestroyClippingRegion()
-{
-    m_clipping = FALSE;
-}
-
 // ---------------------------------------------------------------------------
 // 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 );
-    if (width) *width = int( double(w) / (m_scaleX*m_mm_to_pix_x) );
-    if (height) *height = int( double(h) / (m_scaleY*m_mm_to_pix_y) );
+    if (width) *width = int( double(w) / (m_userScaleX*m_mm_to_pix_x) );
+    if (height) *height = int( double(h) / (m_userScaleY*m_mm_to_pix_y) );
 }
 
 // Resolution in pixels per logical inch
@@ -123,7 +101,7 @@ void wxDC::SetMapMode( int mode )
           break;
     }
     m_mappingMode = mode;
-    
+
 /*  we don't do this mega optimisation
     if (mode != wxMM_TEXT)
     {