From da80ae712a30132bf19127db544959db7e1a7b52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 5 May 2006 22:58:39 +0000 Subject: [PATCH] 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 | 3 +- src/cocoa/dc.mm | 19 ++++---- src/cocoa/window.mm | 2 + src/common/fontcmn.cpp | 8 ++-- src/common/gdicmn.cpp | 2 +- src/generic/imaglist.cpp | 10 +++-- src/generic/renderg.cpp | 5 ++- src/gtk/data.cpp | 2 +- src/gtk/renderer.cpp | 2 +- src/gtk1/data.cpp | 2 +- src/gtk1/renderer.cpp | 2 +- src/html/htmprint.cpp | 1 - src/mac/carbon/app.cpp | 2 +- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/imaglist.cpp | 12 +++-- src/mac/carbon/statbrma.cpp | 6 ++- src/mac/carbon/stattext.cpp | 2 +- src/mac/carbon/textctrl.cpp | 2 +- src/mac/carbon/tooltip.cpp | 2 +- src/mac/carbon/window.cpp | 3 +- src/mac/classic/app.cpp | 2 +- src/mac/classic/control.cpp | 2 +- src/mac/classic/statbrma.cpp | 86 +++++++++++++++++++----------------- src/mac/classic/stattext.cpp | 2 +- src/mac/classic/textctrl.cpp | 2 +- src/mac/classic/tooltip.cpp | 2 +- src/mac/classic/window.cpp | 2 +- src/motif/window.cpp | 2 +- src/x11/window.cpp | 2 +- 29 files changed, 105 insertions(+), 86 deletions(-) diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 18570e9c94..565209e5b1 100644 --- a/src/cocoa/app.mm +++ b/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" diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index b6ee3bf591..4c1ad172aa 100644 --- 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 -// 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); } }; - diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 31fc7b3dad..1a559d5bb8 100644 --- a/src/cocoa/window.mm +++ b/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" diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 743667fa2a..29bce8a1eb 100644 --- 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: @@ -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 - diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 202f10f904..61f6525035 100644 --- 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/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" diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 70e0ee492e..9a658bf285 100644 --- a/src/generic/imaglist.cpp +++ b/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 diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 478d156dcf..ef3c79568c 100644 --- a/src/generic/renderg.cpp +++ b/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 diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp index 714d5169c5..8e47f28a70 100644 --- 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" + #include "wx/dc.h" #endif -#include "wx/dc.h" #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 b2ac87afaf..dc787ba85a 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -28,12 +28,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/dc.h" #endif #include #include "wx/gtk/win_gtk.h" -#include "wx/dc.h" #include "wx/dcclient.h" #include "wx/settings.h" diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp index 48730c7ec9..7b1409e98b 100644 --- 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" + #include "wx/dc.h" #endif -#include "wx/dc.h" #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 43b904d760..04be7d66ec 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -28,12 +28,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/dc.h" #endif #include #include "wx/gtk1/win_gtk.h" -#include "wx/dc.h" #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 013ab79937..df13c18974 100644 --- a/src/html/htmprint.cpp +++ b/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" diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index b133895c49..e0cd306473 100644 --- 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/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" diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 8fe91d84df..ab652bef8d 100644 --- 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" + #include "wx/dc.h" #endif // WX_PRECOMP -#include "wx/dc.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 f97e0715ac..80eb0f7583 100644 --- a/src/mac/carbon/imaglist.cpp +++ b/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)); diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp index e743653a1d..6a8bd124ac 100644 --- 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/dc.h" + +#ifndef WX_PRECOMP + #include "wx/dc.h" +#endif + #include "wx/dcclient.h" #include "wx/mac/private.h" diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 78c2ebeaac..b87cfc6196 100644 --- 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" + #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" diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 6645f1e881..276ee3a62a 100644 --- 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/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" diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp index 8ffbb4101a..1adb42296a 100644 --- 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" + #include "wx/dc.h" #endif // WX_PRECOMP -#include "wx/dc.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 9362c60100..e3631536fa 100644 --- 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/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" diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index fec775419d..6d7e25c1ce 100644 --- 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/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" diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp index 5d178b452f..48775174de 100644 --- 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" + #include "wx/dc.h" #endif // WX_PRECOMP -#include "wx/dc.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 4adcdf4a02..091ac2b1aa 100644 --- 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 -// 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); - dc.Clear() ; + wxPaintDC dc(this); + dc.Clear() ; 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) - 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 , - 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) - 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 , - 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 ) ; diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp index d748041bec..4f85bebb30 100644 --- 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" + #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" diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp index bd8363888b..e12535f5d8 100644 --- 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" + #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" diff --git a/src/mac/classic/tooltip.cpp b/src/mac/classic/tooltip.cpp index cca96f416c..9e37daf461 100644 --- 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" + #include "wx/dc.h" #endif -#include "wx/dc.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 2eefcc4804..15570d1c09 100644 --- 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/dc.h" #endif #include "wx/menu.h" -#include "wx/dc.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 b4dcadb3f0..3d32b54e60 100644 --- 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/dc.h" #endif #include "wx/menu.h" -#include "wx/dc.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 4042d79c7a..c48c7bd02d 100644 --- 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/dc.h" #endif #include "wx/menu.h" -#include "wx/dc.h" #include "wx/dcclient.h" #include "wx/layout.h" #include "wx/dialog.h" -- 2.45.2