Include wx/dc.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/cocoa/app.mm

@@ -11,8 +11,9 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/app.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"

src/cocoa/dc.mm

@@ -6,13 +6,15 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/dc.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
-    #include "wx/dc.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
@@ -374,8 +376,8 @@ void wxDC::DoDrawIcon( const wxIcon &WXUNUSED(icon), int WXUNUSED(x), int WXUNUS
 {
 };
 
-void wxDC::DoDrawPoint( int x, int y ) 
+void wxDC::DoDrawPoint( int x, int y )
-{ 
+{
 };
 
 void wxDC::DoDrawPolygon( int, wxPoint *, int, int, int)
@@ -424,7 +426,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
 }
-    
+
 void wxDC::SetPen(const wxPen& pen)
 {
     m_pen = pen;
@@ -505,7 +507,7 @@ void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
         fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight())
         operation: NSCompositeSourceOver
         fraction: 1.0];
-        
+
     [nsimage release];
     [context restoreGraphicsState];
 }
@@ -596,7 +598,7 @@ void wxDC::SetLogicalFunction(int)
 
 void wxDC::SetMapMode( int mode )
 {
-  switch (mode) 
+  switch (mode)
   {
     case wxMM_TWIPS:
       break;
@@ -660,7 +662,7 @@ void wxDC::ComputeScaleAndOrigin(void)
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
 
-  // CMB: if scale has changed call SetPen to recalulate the line width 
+  // CMB: if scale has changed call SetPen to recalulate the line width
   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
     // this is a bit artificial, but we need to force wxDC to think
@@ -671,4 +673,3 @@ void wxDC::ComputeScaleAndOrigin(void)
     SetPen(* pen);
   }
 };
-

src/cocoa/window.mm

@@ -10,11 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dc.h"
 #endif //WX_PRECOMP
+
 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"

src/common/fontcmn.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/fontcmn.cpp
+// Name:        src/common/fontcmn.cpp
 // Purpose:     implementation of wxFontBase methods
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -21,12 +21,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
-    #include "wx/font.h"
     #include "wx/intl.h"
     #include "wx/dcscreen.h"
 #endif // WX_PRECOMP
@@ -686,4 +687,3 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 }
 
 #endif // generic or wxMSW or wxOS2
-

src/common/gdicmn.cpp

@@ -27,6 +27,7 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/brush.h"
@@ -36,7 +37,6 @@
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"
-#include "wx/dc.h"
 #include "wx/settings.h"
 #include "wx/hashmap.h"
 

src/generic/imaglist.cpp

@@ -20,9 +20,12 @@
 
 #include "wx/generic/imaglist.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+#endif
+
 #include "wx/icon.h"
 #include "wx/image.h"
-#include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
@@ -217,7 +220,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
-    
+
     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 
@@ -277,5 +280,6 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     return true;
 }
 
-#endif // wxUSE_IMAGLIST
 #endif // __WXPALMOS__
+
+#endif // wxUSE_IMAGLIST

src/generic/renderg.cpp

@@ -24,18 +24,19 @@
     #pragma hdrstop
 #endif
 
+#include "wx/renderer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/dc.h"
 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.h"
-#include "wx/dc.h"
 
 #include "wx/settings.h"
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 #include "wx/module.h"
-#include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------
 // wxRendererGeneric: our wxRendererNative implementation

src/gtk/data.cpp

@@ -13,9 +13,9 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif
 
-#include "wx/dc.h"
 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to

src/gtk/renderer.cpp

@@ -28,12 +28,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/settings.h"
 

src/gtk1/data.cpp

@@ -13,9 +13,9 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif
 
-#include "wx/dc.h"
 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to

src/gtk1/renderer.cpp

@@ -28,12 +28,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk1/win_gtk.h"
 
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 
 // RR: After a correction to the orientation of the sash

src/html/htmprint.cpp

@@ -23,7 +23,6 @@
     #include "wx/dc.h"
 #endif
 
-#include "wx/dc.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/html/htmprint.h"

src/mac/carbon/app.cpp

@@ -19,6 +19,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/button.h"
@@ -28,7 +29,6 @@
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
-#include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

src/mac/carbon/control.cpp

@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/panel.h"
+    #include "wx/dc.h"
 #endif // WX_PRECOMP
 
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

src/mac/carbon/imaglist.cpp

@@ -16,9 +16,13 @@
 #if wxUSE_IMAGLIST
 
 #include "wx/imaglist.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+#endif
+
 #include "wx/icon.h"
 #include "wx/image.h"
-#include "wx/dc.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
@@ -75,7 +79,7 @@ int wxImageList::Add( const wxBitmap &bitmap )
                   || (m_width == 0 && m_height == 0),
                   _T("invalid bitmap size in wxImageList: this might work ")
                   _T("on this platform but definitely won't under Windows.") );
-                  
+
     // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
     // bitmap into sub-images of the correct size
     if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
@@ -98,7 +102,7 @@ int wxImageList::Add( const wxBitmap &bitmap )
         m_width = bitmap.GetWidth();
         m_height = bitmap.GetHeight();
     }
-    
+
     return m_images.GetCount() - 1;
 }
 
@@ -227,7 +231,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &ma
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
-    
+
     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 

src/mac/carbon/statbrma.cpp

@@ -12,7 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/statusbr.h"
-#include "wx/dc.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+#endif
+
 #include "wx/dcclient.h"
 
 #include "wx/mac/private.h"

src/mac/carbon/stattext.cpp

@@ -18,11 +18,11 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/dc.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/settings.h"
 

src/mac/carbon/textctrl.cpp

@@ -19,6 +19,7 @@
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/dc.h"
 #endif
 
 #ifdef __DARWIN__
@@ -38,7 +39,6 @@
     #endif
 #endif
 
-#include "wx/dc.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"

src/mac/carbon/tooltip.cpp

@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif // WX_PRECOMP
 
-#include "wx/dc.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"

src/mac/carbon/window.cpp

@@ -19,10 +19,10 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/menu.h"
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
@@ -39,7 +39,6 @@
 #include "wx/textctrl.h"
 
 #include "wx/toolbar.h"
-#include "wx/dc.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"

src/mac/classic/app.cpp

@@ -23,6 +23,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/button.h"
@@ -32,7 +33,6 @@
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
-#include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

src/mac/classic/control.cpp

@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/panel.h"
+    #include "wx/dc.h"
 #endif // WX_PRECOMP
 
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

src/mac/classic/statbrma.cpp

@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        statbar.cpp
+// Name:        src/mac/classic/statbar.cpp
 // Purpose:     native implementation of wxStatusBar (optional)
 // Author:      Stefan Csomor
-// Modified by: 
+// Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
@@ -14,7 +14,11 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/statusbr.h"
-#include "wx/dc.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+#endif
+
 #include "wx/dcclient.h"
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
@@ -52,28 +56,28 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;
-    
+
     wxRect rect;
     GetFieldRect(i, rect);
-    
+
     if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }
-    
+
     wxString text(GetStatusText(i));
-    
+
     long x, y;
-    
+
     dc.GetTextExtent(text, &x, &y);
-    
+
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
-    
+
     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
-    
+
     dc.DrawText(text, xpos, ypos);
-    
+
     dc.DestroyClippingRegion();
 }
 
@@ -86,7 +90,7 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
         _T("invalid status bar field index") );
-    
+
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
@@ -98,53 +102,53 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-  	wxPaintDC dc(this);
+    wxPaintDC dc(this);
-  	dc.Clear() ;
+    dc.Clear() ;
 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 
-	if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+    if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-	{
+    {
-		wxPen white( wxWHITE , 1 , wxSOLID ) ;
+        wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        if (major >= 10) 
+        if (major >= 10)
         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
         }
         else
         {
             wxPen black( wxBLACK , 1 , wxSOLID ) ;
             dc.SetPen(black);
-    	}
+        }
-		dc.DrawLine(0, 0 ,
+        dc.DrawLine(0, 0 ,
-		       m_width , 0);
+                    m_width , 0);
-		dc.SetPen(white);
+        dc.SetPen(white);
-		dc.DrawLine(0, 1 ,
+        dc.DrawLine(0, 1 ,
-		       m_width , 1);
+        m_width , 1);
-	}
+    }
-	else
+    else
-	{
+    {
-        if (major >= 10) 
+        if (major >= 10)
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID)); 
+            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
         else
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 
-		dc.DrawLine(0, 0 ,
+        dc.DrawLine(0, 0 ,
-		       m_width , 0);
+               m_width , 0);
-	}
+    }
 
-	int i;
+    int i;
-	if ( GetFont().Ok() )
+    if ( GetFont().Ok() )
-		dc.SetFont(GetFont());
+        dc.SetFont(GetFont());
-	dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.SetBackgroundMode(wxTRANSPARENT);
 
-	for ( i = 0; i < m_nFields; i ++ )
+    for ( i = 0; i < m_nFields; i ++ )
-		DrawField(dc, i);
+        DrawField(dc, i);
 }
 
-void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+void wxStatusBarMac::MacSuperEnabled( bool enabled )
 {
     Refresh(FALSE) ;
     wxWindow::MacSuperEnabled( enabled ) ;

src/mac/classic/stattext.cpp

@@ -16,11 +16,11 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/settings.h"
 

src/mac/classic/textctrl.cpp

@@ -22,6 +22,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/dc.h"
 #endif
 
 #ifdef __DARWIN__
@@ -41,7 +42,6 @@
     #endif
 #endif
 
-#include "wx/dc.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/notebook.h"

src/mac/classic/tooltip.cpp

@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif
 
-#include "wx/dc.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"

src/mac/classic/window.cpp

@@ -19,10 +19,10 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/menu.h"
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"

src/motif/window.cpp

@@ -32,10 +32,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/menu.h"
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/button.h"

src/x11/window.cpp

@@ -33,10 +33,10 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/menu.h"
-#include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"