wxMotif Solaris 2.6 compilation fixes

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

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 821bef8774504b8fc6d011a50b57b89d205cb637..2f287d17ad184a50c439f1d3f595fc56f43740dd 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -57,15 +57,17 @@ wxDC::wxDC()
     m_scaleX = 1.0;
     m_scaleY = 1.0;
   
     m_scaleX = 1.0;
     m_scaleY = 1.0;
   

-    m_mappingMode = MM_TEXT;
-    m_needComputeScaleX = FALSE;
-    m_needComputeScaleY = FALSE;
+    m_mappingMode = wxMM_TEXT;
+    m_needComputeScaleX = FALSE; /* not used yet */
+    m_needComputeScaleY = FALSE; /* not used yet */

   
   

-    m_signX = 1;  // default x-axis left to right
-    m_signY = 1;  // default y-axis top down
+    m_signX = 1;  /* default x-axis left to right */
+    m_signY = 1;  /* default y-axis top down. -1 in postscript. */

 
 

-    m_maxX = m_maxY = -100000;
-    m_minY = m_minY =  100000;
+    m_maxX = 0;
+    m_maxY = 0;
+    m_minX = 0;
+    m_minY = 0;

 
     m_logicalFunction = wxCOPY;
 //  m_textAlignment = wxALIGN_TOP_LEFT;
 
     m_logicalFunction = wxCOPY;
 //  m_textAlignment = wxALIGN_TOP_LEFT;


@@ -78,7 +80,7 @@ wxDC::wxDC()
     m_brush = *wxTRANSPARENT_BRUSH;
     m_backgroundBrush = *wxWHITE_BRUSH;
   
     m_brush = *wxTRANSPARENT_BRUSH;
     m_backgroundBrush = *wxWHITE_BRUSH;
   

-//  m_palette = wxAPP_COLOURMAP;
+//  m_palette = wxAPP_COLOURMAP; /* I'll learn to handle palettes later in my life */

 }
 
 wxDC::~wxDC()
 }
 
 wxDC::~wxDC()


@@ -215,25 +217,25 @@ 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;
     }
 /*  we don't do this mega optimisation
           SetLogicalScale( 1.0, 1.0 );
           break;
     }
 /*  we don't do this mega optimisation

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

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