Implement left indentation and tab stops support in wxTextCtrl, patch #1518114 -...

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

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 1e89c4f5cc87ffeeb811e7f4c1808c998ce0f91c..884ac2e7e6185db2ef3d7a19facba5e4b83d5633 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -1,37 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/motif/dc.cpp

 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dc.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dc.h"

-#include "wx/dcmemory.h"
-#include "wx/defs.h"

 
 

-    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+#endif

 
 

-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

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


@@ -39,14 +26,14 @@
 
 wxDC::wxDC()
 {
 
 wxDC::wxDC()
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;
 
     m_backgroundMode = wxTRANSPARENT;
 
 
     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;
 
     m_backgroundMode = wxTRANSPARENT;
 

-    m_isInteractive = FALSE;
+    m_isInteractive = false;

 }
 
 void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
 }
 
 void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)


@@ -54,7 +41,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
     wxCHECK_RET( Ok(), "invalid dc" );
     wxCHECK_RET( icon.Ok(), "invalid icon" );
 
     wxCHECK_RET( Ok(), "invalid dc" );
     wxCHECK_RET( icon.Ok(), "invalid icon" );
 

-    DoDrawBitmap(icon, x, y, TRUE);
+    DoDrawBitmap(icon, x, y, true);

 }
 
 void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 }
 
 void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )


@@ -83,7 +70,7 @@ void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useM
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {

-    m_clipping = TRUE;
+    m_clipping = true;

     m_clipX1 = x;
     m_clipY1 = y;
     m_clipX2 = x + width;
     m_clipX1 = x;
     m_clipY1 = y;
     m_clipX2 = x + width;


@@ -139,8 +126,8 @@ void wxDC::SetMapMode( int mode )
     }
     if (mode != wxMM_TEXT)
     {
     }
     if (mode != wxMM_TEXT)
     {

-        m_needComputeScaleX = TRUE;
-        m_needComputeScaleY = TRUE;
+        m_needComputeScaleX = true;
+        m_needComputeScaleY = true;

     }
 }
 
     }
 }
 


@@ -227,4 +214,3 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }

-