Corrected include/wx/palette.h; added wxGenericTreeCtrl::SetFont

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

diff --git a/src/stubs/dc.cpp b/src/stubs/dc.cpp
index 466c670c91d4ecd170bfecb4e77d55aea00ccecd..a70a0f1d135132522880831a7e6ede6c771b47ec 100644 (file)
--- a/src/stubs/dc.cpp
+++ b/src/stubs/dc.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/dc.h"
 
 
 #include "wx/dc.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

-#endif

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


@@ -61,7 +59,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;
   


@@ -146,11 +144,6 @@ void wxDC::DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 )
   };
 };
 
   };
 };
 

-void wxDC::DrawSpline( wxList *points )
-{
-  DrawOpenSpline( points );
-};
-

 void wxDC::DrawSpline( int n, wxPoint points[] )
 {
   wxList list;
 void wxDC::DrawSpline( int n, wxPoint points[] )
 {
   wxList list;


@@ -216,24 +209,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;


@@ -381,10 +374,10 @@ void wxDC::ComputeScaleAndOrigin(void)
   {
     // this is a bit artificial, but we need to force wxDC to think
     // the pen has changed
   {
     // this is a bit artificial, but we need to force wxDC to think
     // the pen has changed

-    wxPen* pen = GetPen();
+    wxPen* pen = & GetPen();

     wxPen tempPen;
     m_pen = tempPen;
     wxPen tempPen;
     m_pen = tempPen;

-    SetPen(pen);
+    SetPen(* pen);

   }
 };
 
   }
 };