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

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 18570e9c94fb32258c37f4fd343a8ca4b8441d77..565209e5b159ea7764ebca3a5e7942941891f999 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -11,8 +11,9 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/app.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/app.h"

     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index b6ee3bf591301e93d35f4570f356e20fd568c7b8..4c1ad172aa2dfe62d23f81e45dd9b9012360bf43 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -6,13 +6,15 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/dc.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/dc.h"

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.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)
 };
 
 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::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
 }

-    
+

 void wxDC::SetPen(const wxPen& pen)
 {
     m_pen = pen;
 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];
         fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight())
         operation: NSCompositeSourceOver
         fraction: 1.0];

-        
+

     [nsimage release];
     [context restoreGraphicsState];
 }
     [nsimage release];
     [context restoreGraphicsState];
 }


@@ -596,7 +598,7 @@ void wxDC::SetLogicalFunction(int)
 
 void wxDC::SetMapMode( int mode )
 {
 
 void wxDC::SetMapMode( int mode )
 {

-  switch (mode) 
+  switch (mode)

   {
     case wxMM_TWIPS:
       break;
   {
     case wxMM_TWIPS:
       break;


@@ -660,7 +662,7 @@ void wxDC::ComputeScaleAndOrigin(void)
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
 
   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
   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);
   }
 };
     SetPen(* pen);
   }
 };

-

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 31fc7b3dad6f7b84f37ab39bdcfa8ca307b769fb..1a559d5bb8dc8e07aff147d5237d0f0b49d8e99b 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -10,11 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dc.h"
 #endif //WX_PRECOMP
 #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"
 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 743667fa2ae922e9befe0b821759c48fcdef7b7e..29bce8a1eb5049ce47afcb1bccf7f0659e0619c6 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/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:
 // Purpose:     implementation of wxFontBase methods
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -21,12 +21,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/font.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dc.h"
 #ifndef WX_PRECOMP
     #include "wx/dc.h"

-    #include "wx/font.h"

     #include "wx/intl.h"
     #include "wx/dcscreen.h"
 #endif // WX_PRECOMP
     #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
 }
 
 #endif // generic or wxMSW or wxOS2

-

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 202f10f90440ddc920804b1308cb8b9e22004361..61f65250351869420df858cfed099641e37ba594 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -27,6 +27,7 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/brush.h"
 #endif
 
 #include "wx/brush.h"


@@ -36,7 +37,6 @@
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"

-#include "wx/dc.h"

 #include "wx/settings.h"
 #include "wx/hashmap.h"
 
 #include "wx/settings.h"
 #include "wx/hashmap.h"
 

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 70e0ee492ef69e6c7f8bfd5387d5dfe7e1814814..9a658bf2854a5759b18d0472f9060b42cf1e5f9d 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -20,9 +20,12 @@
 
 #include "wx/generic/imaglist.h"
 
 
 #include "wx/generic/imaglist.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+#endif
+

 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/image.h"

-#include "wx/dc.h"

 
 //-----------------------------------------------------------------------------
 //  wxImageList
 
 //-----------------------------------------------------------------------------
 //  wxImageList


@@ -217,7 +220,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }

-    
+

     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 
     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;
 }
 
     return true;
 }
 

-#endif // wxUSE_IMAGLIST

 #endif // __WXPALMOS__
 #endif // __WXPALMOS__

+
+#endif // wxUSE_IMAGLIST

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 478d156dcfce0fa352197411665b759abc0ff6e0..ef3c79568cad5cdf2530dbd37fe39b564c3c35e8 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -24,18 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/renderer.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/dc.h"

 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.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/settings.h"
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 #include "wx/module.h"

-#include "wx/renderer.h"

 
 // ----------------------------------------------------------------------------
 // wxRendererGeneric: our wxRendererNative implementation
 
 // ----------------------------------------------------------------------------
 // wxRendererGeneric: our wxRendererNative implementation

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 714d5169c51ebfd91fcee5cd953e0f5d3b1396e1..8e47f28a70607172e21c2a4c4ad911069e0bc009 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -13,9 +13,9 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"

+    #include "wx/dc.h"

 #endif
 
 #endif
 

-#include "wx/dc.h"

 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to
 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index b2ac87afaf6adb06a11dc3bfe0105cd1a0b786c3..dc787ba85a793d88e379e8692d1c2b72166210b8 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -28,12 +28,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/dc.h"

 #endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/settings.h"
 
 #include "wx/dcclient.h"
 #include "wx/settings.h"
 

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 48730c7ec978231ec0b4cc76a2dd4de868bb1a89..7b1409e98b72f2169e2928ba11558be9ec90a783 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -13,9 +13,9 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"

+    #include "wx/dc.h"

 #endif
 
 #endif
 

-#include "wx/dc.h"

 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to
 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 43b904d76027728dd70225ca1159027dd342dd90..04be7d66ec9088b393525515850a19c8827a9e63 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -28,12 +28,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/dc.h"

 #endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk1/win_gtk.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
 #include "wx/dcclient.h"
 
 // RR: After a correction to the orientation of the sash

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 013ab79937eb1cd04ce47b786b494a46894f145a..df13c1897454c139cbce0be2a1abff429154d79c 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -23,7 +23,6 @@
     #include "wx/dc.h"
 #endif
 
     #include "wx/dc.h"
 #endif
 

-#include "wx/dc.h"

 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/html/htmprint.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/html/htmprint.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index b133895c4922fc525095588ef5769e90c466ce15..e0cd3064735890b66a9678e7ecd35eab53c1ce74 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -19,6 +19,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/button.h"
 #endif
 
 #include "wx/button.h"


@@ -28,7 +29,6 @@
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
 #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"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 8fe91d84df49c828c06e4c1f907523631c4bda82..ab652bef8dcd224c521e30fc31ada56bd31cd9fd 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/panel.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/panel.h"

+    #include "wx/dc.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dcclient.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

diff --git a/src/mac/carbon/imaglist.cpp b/src/mac/carbon/imaglist.cpp
index f97e0715ac21a285194b429b5a739ae0daeb456d..80eb0f7583177fd93e180e3def06a9e288e4f7a5 100644 (file)
--- a/src/mac/carbon/imaglist.cpp
+++ b/src/mac/carbon/imaglist.cpp
@@ -16,9 +16,13 @@
 #if wxUSE_IMAGLIST
 
 #include "wx/imaglist.h"
 #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/icon.h"
 #include "wx/image.h"

-#include "wx/dc.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 
 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.") );
                   || (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)
     // 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();
     }
         m_width = bitmap.GetWidth();
         m_height = bitmap.GetHeight();
     }

-    
+

     return m_images.GetCount() - 1;
 }
 
     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 );
     }
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }

-    
+

     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 
     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index e743653a1da2e79b03b98a6f596af546d3edc454..6a8bd124ac4c88ba6234b921af799c6351448491 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -12,7 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/statusbr.h"
 #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"
 #include "wx/dcclient.h"
 
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 78c2ebeaaccfab0337e1245ddc58d31919528c6d..b87cfc619671715c2dd10855ae6b6b55fd5e54ca 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -18,11 +18,11 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #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"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/settings.h"
 
 #include "wx/dcclient.h"
 #include "wx/settings.h"
 

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 6645f1e8818d7b4af30590a17e078639c4864890..276ee3a62a1ea2a1c7450a2a0fddd880c68a7618 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -19,6 +19,7 @@
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/dc.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -38,7 +39,6 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/dc.h"

 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 8ffbb4101a6009087cc2b48a2e2c26f9c36ce1e9..1adb42296aa29c52088655a4cf49660944fce9a3 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"

+    #include "wx/dc.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dc.h"

 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 9362c60100c74cef14bf34c8776694bb3501eca4..e3631536fa9879ee9001ee7a15b26f26eddd636e 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -19,10 +19,10 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.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/textctrl.h"
 
 #include "wx/toolbar.h"

-#include "wx/dc.h"

 
 #if wxUSE_CARET
     #include "wx/caret.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index fec775419d8ff9db6c0bea23dbad8c3272ef3192..6d7e25c1ce693ef84f60593360ca80cdc0293880 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -23,6 +23,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/button.h"
 #endif
 
 #include "wx/button.h"


@@ -32,7 +33,6 @@
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
 #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"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 5d178b452fdc63e17e3f0d5136670dd2b5bc38c2..48775174deaf0bb110ae54a611f484936ed95f08 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/panel.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/panel.h"

+    #include "wx/dc.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dcclient.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp
index 4adcdf4a026b0ad7a118df6c5f7a8d7674fe882a..091ac2b1aa2b23ce48419c6afadc5b79dd23458e 100644 (file)
--- a/src/mac/classic/statbrma.cpp
+++ b/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
 // 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
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor


@@ -14,7 +14,11 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/statusbr.h"
 // ----------------------------------------------------------------------------
 
 #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)
 #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;
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;

-    
+

     wxRect rect;
     GetFieldRect(i, rect);
     wxRect rect;
     GetFieldRect(i, rect);

-    
+

     if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }
     if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }

-    
+

     wxString text(GetStatusText(i));
     wxString text(GetStatusText(i));

-    
+

     long x, y;
     long x, y;

-    
+

     dc.GetTextExtent(text, &x, &y);
     dc.GetTextExtent(text, &x, &y);

-    
+

     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;

-    
+

     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);

-    
+

     dc.DrawText(text, xpos, ypos);
     dc.DrawText(text, xpos, ypos);

-    
+

     dc.DestroyClippingRegion();
 }
 
     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") );
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
         _T("invalid status bar field index") );

-    
+

     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
     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) )
 {
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {

-       wxPaintDC dc(this);
-       dc.Clear() ;
+    wxPaintDC dc(this);
+    dc.Clear() ;

 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 
 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 

-       if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-       {
-               wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        if (major >= 10) 
+    if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+    {
+        wxPen white( wxWHITE , 1 , wxSOLID ) ;
+        if (major >= 10)

         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
         {
             //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);
         }
         else
         {
             wxPen black( wxBLACK , 1 , wxSOLID ) ;
             dc.SetPen(black);

-       }
-               dc.DrawLine(0, 0 ,
-                      m_width , 0);
-               dc.SetPen(white);
-               dc.DrawLine(0, 1 ,
-                      m_width , 1);
-       }
-       else
-       {
-        if (major >= 10) 
+        }
+        dc.DrawLine(0, 0 ,
+                    m_width , 0);
+        dc.SetPen(white);
+        dc.DrawLine(0, 1 ,
+        m_width , 1);
+    }
+    else
+    {
+        if (major >= 10)

             //Finder statusbar border color: (Project builder similar is 9B9B9B)
             //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));
 
         else
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 

-               dc.DrawLine(0, 0 ,
-                      m_width , 0);
-       }
+        dc.DrawLine(0, 0 ,
+               m_width , 0);
+    }

 
 

-       int i;
-       if ( GetFont().Ok() )
-               dc.SetFont(GetFont());
-       dc.SetBackgroundMode(wxTRANSPARENT);
+    int i;
+    if ( GetFont().Ok() )
+        dc.SetFont(GetFont());
+    dc.SetBackgroundMode(wxTRANSPARENT);

 
 

-       for ( i = 0; i < m_nFields; i ++ )
-               DrawField(dc, i);
+    for ( i = 0; i < m_nFields; i ++ )
+        DrawField(dc, i);

 }
 
 }
 

-void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+void wxStatusBarMac::MacSuperEnabled( bool enabled )

 {
     Refresh(FALSE) ;
     wxWindow::MacSuperEnabled( enabled ) ;
 {
     Refresh(FALSE) ;
     wxWindow::MacSuperEnabled( enabled ) ;

diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index d748041bec3da0431c785868e3dca5a229d178ce..4f85bebb309129dea52d3d44b2190cb82fba1e0e 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -16,11 +16,11 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/settings.h"
 
 #include "wx/dcclient.h"
 #include "wx/settings.h"
 

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index bd8363888b38cadbbefeea7c7bfc89a48e1141d9..e12535f5d889e214104e2755457a278c966e035d 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -22,6 +22,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/dc.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -41,7 +42,6 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/dc.h"

 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/notebook.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/notebook.h"

diff --git a/src/mac/classic/tooltip.cpp b/src/mac/classic/tooltip.cpp
index cca96f416c5b5378dabc223c9de1c54096a824e1..9e37daf4613a91de799507e7744213df870db179 100644 (file)
--- a/src/mac/classic/tooltip.cpp
+++ b/src/mac/classic/tooltip.cpp
@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"

+    #include "wx/dc.h"

 #endif
 
 #endif
 

-#include "wx/dc.h"

 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 2eefcc4804edff1b7c74daa5bcaa66022839a4cd..15570d1c09c4baaa19e92aef7eafa94f42be0e0b 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -19,10 +19,10 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index b4dcadb3f039cb802194d6fc56e17eb60ba94d25..3d32b54e60d683f2eab35684a12d4d2c2f850700 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -32,10 +32,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/button.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 4042d79c7a0662bd27075d9adde5df5028e32569..c48c7bd02d1214aa0d420e80490cace0d498bef7 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -33,10 +33,10 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/frame.h"

+    #include "wx/dc.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"

-#include "wx/dc.h"

 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/dcclient.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"