Documenting WX_MONOLITHIC build option.

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index fadb078d01ba56eaa8703cbc3436937a31aeb167..092f356574bbae39483e0e27e8c7397a5d33a5fc 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

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

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -29,8 +25,7 @@
 #endif
 
 #include "wx/dc.h"
 #endif
 
 #include "wx/dc.h"

-
-#include <math.h>
+#include "wx/math.h"

 
 // bool wxDCBase::sm_cacheing = false;
 
 
 // bool wxDCBase::sm_cacheing = false;
 


@@ -38,6 +33,16 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+#if WXWIN_COMPATIBILITY_2_6
+void wxDCBase::BeginDrawing()
+{
+}
+
+void wxDCBase::EndDrawing()
+{
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+

 // ----------------------------------------------------------------------------
 // special symbols
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // special symbols
 // ----------------------------------------------------------------------------


@@ -316,10 +321,10 @@ void wxDCBase::DoDrawSpline( wxList *points )
     double           x1, y1, x2, y2;
 
     wxList::compatibility_iterator node = points->GetFirst();
     double           x1, y1, x2, y2;
 
     wxList::compatibility_iterator node = points->GetFirst();

-    if (node == NULL)
+    if (node == wxList::compatibility_iterator())

         // empty list
         return;
         // empty list
         return;

-    
+

     p = (wxPoint *)node->GetData();
 
     x1 = p->x;
     p = (wxPoint *)node->GetData();
 
     x1 = p->x;


@@ -375,7 +380,7 @@ void wxDCBase::DoDrawSpline( wxList *points )
 
 
 // Each element of the widths array will be the width of the string up to and
 
 
 // Each element of the widths array will be the width of the string up to and

-// including the coresponding character in text.  This is the generic
+// including the corresponding character in text.  This is the generic

 // implementation, the port-specific classes should do this with native APIs
 // if available and if faster.  Note: pango_layout_index_to_pos is much slower
 // than calling GetTextExtent!!
 // implementation, the port-specific classes should do this with native APIs
 // if available and if faster.  Note: pango_layout_index_to_pos is much slower
 // than calling GetTextExtent!!


@@ -407,15 +412,14 @@ bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths)
 {
     int totalWidth = 0;
 
 {
     int totalWidth = 0;
 

-    size_t i, len = text.Length();
+    const size_t len = text.Length();

     widths.Empty();
     widths.Add(0, len);
     widths.Empty();
     widths.Add(0, len);

-    int w, h;

 
     // reset the cache if font or horizontal scale have changed
 
     // reset the cache if font or horizontal scale have changed

-    if (!s_fontWidthCache.m_widths ||
-        (s_fontWidthCache.m_scaleX != m_scaleX) ||
-        (s_fontWidthCache.m_font != GetFont()))
+    if ( !s_fontWidthCache.m_widths ||
+         !wxIsSameDouble(s_fontWidthCache.m_scaleX, m_scaleX) ||
+         (s_fontWidthCache.m_font != GetFont()) )

     {
         s_fontWidthCache.Reset();
         s_fontWidthCache.m_font = GetFont();
     {
         s_fontWidthCache.Reset();
         s_fontWidthCache.m_font = GetFont();


@@ -424,7 +428,8 @@ bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths)
 
     // Calculate the position of each character based on the widths of
     // the previous characters
 
     // Calculate the position of each character based on the widths of
     // the previous characters

-    for (i=0; i<len; i++)
+    int w, h;
+    for ( size_t i = 0; i < len; i++ )

     {
         const wxChar c = text[i];
         unsigned int c_int = (unsigned int)c;
     {
         const wxChar c = text[i];
         unsigned int c_int = (unsigned int)c;


@@ -766,7 +771,7 @@ void wxDCBase::Rotate( wxList* points, double angle, wxPoint center )
 {
     if( angle != 0.0 )
     {
 {
     if( angle != 0.0 )
     {

-        double pi(3.1415926536);
+        double pi(M_PI);

         double dSinA = -sin(angle*2.0*pi/360.0);
         double dCosA = cos(angle*2.0*pi/360.0);
         for ( wxNode* node = points->First(); node; node = node->Next() )
         double dSinA = -sin(angle*2.0*pi/360.0);
         double dCosA = cos(angle*2.0*pi/360.0);
         for ( wxNode* node = points->First(); node; node = node->Next() )


@@ -794,7 +799,7 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
                                         wxCoord w, wxCoord h,
                                         double sa, double ea )
 {
                                         wxCoord w, wxCoord h,
                                         double sa, double ea )
 {

-    double pi = 3.1415926535;
+    double pi = M_PI;

     double sar = 0;
     double ear = 0;
     int xsa = 0;
     double sar = 0;
     double ear = 0;
     int xsa = 0;