use wxConvLocal for wxFONTENCODING_SYSTEM/DEFAULT in wxConvertToGTK()

[wxWidgets.git] / src / x11 / dc.cpp

diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp
index cad69fdf09bd3801055f2d80aeaf32bd2f351d9e..f36c6febaf3c3f8d686cbcb315ec27af2abdcc09 100644 (file)
--- a/src/x11/dc.cpp
+++ b/src/x11/dc.cpp
@@ -9,27 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dc.h"
-#endif
-

 #include "wx/dc.h"
 #include "wx/dcmemory.h"
 #include "wx/defs.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 #include "wx/dc.h"
 #include "wx/dcmemory.h"
 #include "wx/defs.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 

-//-----------------------------------------------------------------------------
-// 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
-

 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------


@@ -71,11 +56,6 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
     m_clipY2 = y + height;
 }
 
     m_clipY2 = y + height;
 }
 

-void wxDC::DestroyClippingRegion()
-{
-    m_clipping = FALSE;
-}
-

 void wxDC::DoGetSizeMM( int* width, int* height ) const
 {
     int w, h;
 void wxDC::DoGetSizeMM( int* width, int* height ) const
 {
     int w, h;