Make wxGTK1.2 compile again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 33c6663eb986fa3fa98a39b5ac7b61a1dc0b8bdb..8d6a4b1a899361321113eaf61e300efa8578ca31 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -38,7 +38,7 @@ public:
     virtual void StartPage() { }
     virtual void EndPage() { }
 
-protected:
+public:
     // implementation
     wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
     wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 53b451a8f345cd3e5810e5e88cf52f6c93cac259..6ca04a920e214c1be6868573718c8feb4f22faae 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -25,14 +25,6 @@ wxDC::wxDC()
 {
     m_ok = FALSE;
 
-    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 */
-
     m_logicalFunction = wxCOPY;
 
     m_pen = *wxBLACK_PEN;