From: Robert Roebling Date: Sat, 5 May 2007 15:52:53 +0000 (+0000) Subject: Make wxGTK1.2 compile again. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e8b86d2538a5d5c2f39f2061f57e1b90423f7423 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 33c6663eb9..8d6a4b1a89 100644 --- 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 53b451a8f3..6ca04a920e 100644 --- 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;