switched to new XPM code in wxMSW

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

diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
index 054ba0407c09049a2bd60f6edbad53c6cea06fdb..a4cb431cf965f0be03219e32b2d2f73e3cc3ff09 100644 (file)
--- a/src/qt/dc.cpp
+++ b/src/qt/dc.cpp
@@ -1,20 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dc.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dc.cpp

-// Purpose:
-// Author:      Robert Roebling
+// Purpose:     wxDC class
+// Author:      AUTHOR
+// Modified by:

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) AUTHOR

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifdef __GNUG__
 #pragma implementation "dc.h"
 #endif
 
 #include "wx/dc.h"
 
 #ifdef __GNUG__
 #pragma implementation "dc.h"
 #endif
 
 #include "wx/dc.h"
 

+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------


@@ -59,7 +61,7 @@ wxDC::wxDC(void)
   m_scaleX = 1.0;
   m_scaleY = 1.0;
   
   m_scaleX = 1.0;
   m_scaleY = 1.0;
   

-  m_mappingMode = MM_TEXT;
+  m_mappingMode = wxMM_TEXT;

   m_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;
   
   m_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;
   


@@ -87,12 +89,7 @@ wxDC::~wxDC(void)
 {
 };
 
 {
 };
 

-void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2), 
-  double WXUNUSED(xc), double WXUNUSED(yc) )
-{
-};
-
-void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) ) 
+void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) )

 {
 };
 
 {
 };
 


@@ -219,24 +216,24 @@ void wxDC::SetMapMode( int mode )
 {
   switch (mode) 
   {
 {
   switch (mode) 
   {

-    case MM_TWIPS:
+    case wxMM_TWIPS:

       SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
       break;
       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;
       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;
       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:
       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;
   };
       SetLogicalScale( 1.0, 1.0 );
       break;
   };

-  if (mode != MM_TEXT)
+  if (mode != wxMM_TEXT)

   {
     m_needComputeScaleX = TRUE;
     m_needComputeScaleY = TRUE;
   {
     m_needComputeScaleX = TRUE;
     m_needComputeScaleY = TRUE;