cosmetic fixes to font encoding names

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

diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
index 4cfe7305cc064d5075db6648e26af22e27b31ef3..a4cb431cf965f0be03219e32b2d2f73e3cc3ff09 100644 (file)
--- a/src/qt/dc.cpp
+++ b/src/qt/dc.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/dc.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // constants
@@ -63,7 +61,7 @@ wxDC::wxDC(void)
   m_scaleX = 1.0;
   m_scaleY = 1.0;
   
-  m_mappingMode = MM_TEXT;
+  m_mappingMode = wxMM_TEXT;
   m_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;
   
@@ -218,24 +216,24 @@ void wxDC::SetMapMode( int mode )
 {
   switch (mode) 
   {
-    case MM_TWIPS:
+    case wxMM_TWIPS:
       SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
       break;
-    case MM_POINTS:
+    case wxMM_POINTS:
       SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
       break;
-    case MM_METRIC:
+    case wxMM_METRIC:
       SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
       break;
-    case MM_LOMETRIC:
+    case wxMM_LOMETRIC:
       SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
       break;
     default:
-    case MM_TEXT:
+    case wxMM_TEXT:
       SetLogicalScale( 1.0, 1.0 );
       break;
   };
-  if (mode != MM_TEXT)
+  if (mode != wxMM_TEXT)
   {
     m_needComputeScaleX = TRUE;
     m_needComputeScaleY = TRUE;