From ed4b0fdca60e017afe72c55940799ce0fed925f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Sat, 6 May 2006 21:51:49 +0000 Subject: [PATCH] Include wx/dcclient.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/buttonbar.cpp | 2 +- src/generic/datavgen.cpp | 6 +++++- src/generic/notebook.cpp | 2 +- src/generic/sashwin.cpp | 10 +++++----- src/generic/scrlwing.cpp | 8 ++++---- src/generic/splash.cpp | 13 ++++++------- src/generic/treectlg.cpp | 9 ++++++--- src/gtk/dataview.cpp | 4 ++-- src/gtk/frame.cpp | 2 +- src/gtk/renderer.cpp | 2 +- src/gtk/toplevel.cpp | 2 +- src/gtk/window.cpp | 2 +- src/gtk1/frame.cpp | 2 +- src/gtk1/renderer.cpp | 3 +-- src/gtk1/toplevel.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/fontdlg.cpp | 1 - src/mac/carbon/frame.cpp | 2 +- src/mac/carbon/renderer.cpp | 3 +-- src/mac/carbon/statbmp.cpp | 18 ++++++++++-------- src/mac/carbon/statbrma.cpp | 3 +-- src/mac/carbon/stattext.cpp | 2 +- src/mac/carbon/window.cpp | 2 +- src/mac/classic/control.cpp | 2 +- src/mac/classic/frame.cpp | 2 +- src/mac/classic/statbmp.cpp | 7 +++++-- src/mac/classic/statbrma.cpp | 5 ++--- src/mac/classic/stattext.cpp | 2 +- src/mac/classic/window.cpp | 2 +- src/mgl/dcclient.cpp | 7 ++++--- src/motif/window.cpp | 2 +- src/msw/listctrl.cpp | 2 +- src/msw/mediactrl.cpp | 2 +- src/msw/mediactrl_am.cpp | 2 +- src/msw/notebook.cpp | 2 +- src/msw/ole/activex.cpp | 5 ++++- src/os2/listctrl.cpp | 2 +- src/os2/statbmp.cpp | 2 +- src/palmos/listctrl.cpp | 3 +-- src/univ/menu.cpp | 2 +- src/unix/taskbarx11.cpp | 2 +- src/x11/textctrl.cpp | 2 +- src/x11/window.cpp | 2 +- 44 files changed, 85 insertions(+), 76 deletions(-) diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp index e3c19e3144..98b1b160a7 100644 --- a/src/generic/buttonbar.cpp +++ b/src/generic/buttonbar.cpp @@ -35,11 +35,11 @@ #include "wx/app.h" #include "wx/log.h" #include "wx/frame.h" + #include "wx/dcclient.h" #endif #include "wx/image.h" #include "wx/settings.h" -#include "wx/dcclient.h" // ---------------------------------------------------------------------------- // wxButtonToolBarTool: our implementation of wxToolBarToolBase diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 1c2b8a2e18..662fcb16df 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -10,6 +10,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" @@ -19,10 +23,10 @@ #ifndef WX_PRECOMP #include "wx/sizer.h" #include "wx/log.h" + #include "wx/dcclient.h" #endif #include "wx/stockitem.h" -#include "wx/dcclient.h" #include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/renderer.h" diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index c5e67adbe2..c9d8269869 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -31,11 +31,11 @@ #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" + #include "wx/dcclient.h" #endif #include "wx/settings.h" #include "wx/generic/imaglist.h" -#include "wx/dcclient.h" #include "wx/generic/tabg.h" // ---------------------------------------------------------------------------- diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp index b9e554da14..752516aa9d 100644 --- a/src/generic/sashwin.cpp +++ b/src/generic/sashwin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sashwin.cpp +// Name: src/generic/sashwin.cpp // Purpose: wxSashWindow implementation. A sash window has an optional // sash on each edge, allowing it to be dragged. An event // is generated when the sash is released. @@ -15,7 +15,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SASH @@ -24,6 +24,7 @@ #include "wx/dialog.h" #include "wx/frame.h" #include "wx/settings.h" + #include "wx/dcclient.h" #endif #include "wx/math.h" @@ -31,7 +32,6 @@ #include #include "wx/dcscreen.h" -#include "wx/dcclient.h" #include "wx/sashwin.h" #include "wx/laywin.h" @@ -46,7 +46,7 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow) EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent) #if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_SET_CURSOR(wxSashWindow::OnSetCursor) -#endif // wxMSW +#endif // __WXMSW__ || __WXMAC__ END_EVENT_TABLE() @@ -703,6 +703,6 @@ void wxSashWindow::OnSetCursor(wxSetCursorEvent& event) //else: do nothing, in particular, don't call Skip() } -#endif // wxMSW +#endif // __WXMSW__ || __WXMAC__ #endif // wxUSE_SASH diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 442efe3f83..53b6270584 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/scrolwin.cpp +// Name: src/generic/scrlwing.cpp // Purpose: wxScrolledWindow implementation // Author: Julian Smart // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement. @@ -34,13 +34,13 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/panel.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" - #if wxUSE_TIMER -#include "wx/timer.h" + #include "wx/timer.h" #endif + #include "wx/sizer.h" #include "wx/recguard.h" diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index e17b168167..7695803aab 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: splash.cpp +// Name: src/generic/splash.cpp // Purpose: wxSplashScreen class // Author: Julian Smart // Modified by: @@ -13,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SPLASH @@ -22,13 +22,12 @@ #include #endif -#ifndef WX_PRECOMP -#include "wx/dcmemory.h" -#include "wx/dcclient.h" -#endif - #include "wx/splash.h" +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" + #include "wx/dcclient.h" +#endif /* * wxSplashScreen diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index a536833274..577ecbc4e1 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: treectlg.cpp +// Name: src/generic/treectlg.cpp // Purpose: generic tree control implementation // Author: Robert Roebling // Created: 01/02/97 @@ -26,14 +26,17 @@ #if wxUSE_TREECTRL -#include "wx/treebase.h" #include "wx/treectrl.h" + +#ifndef WX_PRECOMP + #include "wx/dcclient.h" +#endif + #include "wx/generic/treectlg.h" #include "wx/timer.h" #include "wx/textctrl.h" #include "wx/imaglist.h" #include "wx/settings.h" -#include "wx/dcclient.h" #include "wx/renderer.h" diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index a679ac635a..4b2c185b3f 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -18,10 +18,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/dcclient.h" #endif #include "wx/stockitem.h" -#include "wx/dcclient.h" #include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/sizer.h" @@ -1437,7 +1437,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, m_treeview = gtk_tree_view_new(); gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); - + if (style & wxDV_MULTIPLE) { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 6706922aae..1aebe9aac2 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/dialog.h" @@ -33,7 +34,6 @@ #if wxUSE_STATUSBAR #include "wx/statusbr.h" #endif -#include "wx/dcclient.h" #include #include "wx/gtk/private.h" diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index dc787ba85a..ef18a54170 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -29,12 +29,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include #include "wx/gtk/win_gtk.h" -#include "wx/dcclient.h" #include "wx/settings.h" // RR: After a correction to the orientation of the sash diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index a28e6741a1..4f33dc0d04 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -27,11 +27,11 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/dcclient.h" #endif #include "wx/dialog.h" #include "wx/control.h" -#include "wx/dcclient.h" #include "wx/gtk/private.h" #include "wx/timer.h" #include "wx/settings.h" diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index d7d79ebf1a..a63c33eb9c 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -22,9 +22,9 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/frame.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/msgdlg.h" diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index bd426249ad..1deda790eb 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/dialog.h" @@ -33,7 +34,6 @@ #if wxUSE_STATUSBAR #include "wx/statusbr.h" #endif -#include "wx/dcclient.h" #include #include "wx/gtk1/private.h" diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index 04be7d66ec..ebbb1e17b7 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -29,13 +29,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include #include "wx/gtk1/win_gtk.h" -#include "wx/dcclient.h" - // RR: After a correction to the orientation of the sash // this doesn't seem to be required anymore and it // seems to confuse some themes so USE_ERASE_RECT=0 diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index b34f80b278..50731776a9 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -27,11 +27,11 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/dcclient.h" #endif #include "wx/dialog.h" #include "wx/control.h" -#include "wx/dcclient.h" #include "wx/gtk1/private.h" #include "wx/timer.h" #include "wx/settings.h" diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 78f316c9e9..a36bfe0a10 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -22,9 +22,9 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/frame.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/msgdlg.h" diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index ab652bef8d..417c018cda 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -17,9 +17,9 @@ #include "wx/app.h" #include "wx/panel.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP -#include "wx/dcclient.h" #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/radiobox.h" diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index 90ccac9239..3fab91215e 100644 --- a/src/mac/carbon/fontdlg.cpp +++ b/src/mac/carbon/fontdlg.cpp @@ -39,7 +39,6 @@ #endif #include "wx/fontdlg.h" -#include "wx/dcclient.h" #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 47505c64d7..b3464ad2cd 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -15,13 +15,13 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" #include "wx/menu.h" -#include "wx/dcclient.h" #include "wx/dialog.h" #include "wx/settings.h" diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index 3799d0cce7..6735b1f62b 100644 --- a/src/mac/carbon/renderer.cpp +++ b/src/mac/carbon/renderer.cpp @@ -21,11 +21,11 @@ #include "wx/dc.h" #include "wx/bitmap.h" #include "wx/settings.h" + #include "wx/dcclient.h" #endif #include "wx/renderer.h" #include "wx/toplevel.h" -#include "wx/dcclient.h" #include "wx/mac/uma.h" @@ -359,4 +359,3 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win, } } } - diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp index e7ce2f1633..7aad88f18a 100644 --- a/src/mac/carbon/statbmp.cpp +++ b/src/mac/carbon/statbmp.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/mac/carbon/statbmp.cpp // Purpose: wxStaticBitmap // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -14,7 +14,10 @@ #if wxUSE_STATBMP #include "wx/statbmp.h" -#include "wx/dcclient.h" + +#ifndef WX_PRECOMP + #include "wx/dcclient.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) @@ -39,7 +42,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, m_foregroundColour = parent->GetForegroundColour() ; m_bitmap = bitmap; - if ( id == -1 ) + if ( id == wxID_ANY ) m_windowId = (int)NewControlId(); else m_windowId = id; @@ -48,7 +51,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name ); SetBestSize( size ) ; - + return ret; } @@ -60,7 +63,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) Refresh() ; } -void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) +void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); PrepareDC(dc); @@ -77,8 +80,7 @@ wxSize wxStaticBitmap::DoGetBestSize() const return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) ); // this is completely arbitrary - return DoGetSizeFromClientSize( wxSize(16, 16) ); + return DoGetSizeFromClientSize( wxSize(16, 16) ); } #endif - diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp index 6a8bd124ac..1ac0683501 100644 --- a/src/mac/carbon/statbrma.cpp +++ b/src/mac/carbon/statbrma.cpp @@ -15,10 +15,9 @@ #ifndef WX_PRECOMP #include "wx/dc.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" - #include "wx/mac/private.h" #include "wx/toplevel.h" diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index b87cfc6196..1aea449abc 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -19,11 +19,11 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/notebook.h" #include "wx/tabctrl.h" -#include "wx/dcclient.h" #include "wx/settings.h" #include "wx/mac/uma.h" diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index e3631536fa..736d80406d 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -20,10 +20,10 @@ #include "wx/panel.h" #include "wx/frame.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include "wx/menu.h" -#include "wx/dcclient.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/scrolbar.h" diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp index 48775174de..9e8e3660f6 100644 --- a/src/mac/classic/control.cpp +++ b/src/mac/classic/control.cpp @@ -21,9 +21,9 @@ #include "wx/app.h" #include "wx/panel.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP -#include "wx/dcclient.h" #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/radiobox.h" diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp index b54dda7bf1..6cd7b8fb01 100644 --- a/src/mac/classic/frame.cpp +++ b/src/mac/classic/frame.cpp @@ -15,13 +15,13 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" #include "wx/menu.h" -#include "wx/dcclient.h" #include "wx/dialog.h" #include "wx/settings.h" diff --git a/src/mac/classic/statbmp.cpp b/src/mac/classic/statbmp.cpp index 0282d8491b..e34226021d 100644 --- a/src/mac/classic/statbmp.cpp +++ b/src/mac/classic/statbmp.cpp @@ -16,7 +16,10 @@ #endif #include "wx/statbmp.h" -#include "wx/dcclient.h" + +#ifndef WX_PRECOMP + #include "wx/dcclient.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) @@ -49,7 +52,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, m_foregroundColour = parent->GetForegroundColour() ; m_bitmap = bitmap; - if ( id == -1 ) + if ( id == wxID_ANY ) m_windowId = (int)NewControlId(); else m_windowId = id; diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp index 091ac2b1aa..f2a36929af 100644 --- a/src/mac/classic/statbrma.cpp +++ b/src/mac/classic/statbrma.cpp @@ -17,16 +17,15 @@ #ifndef WX_PRECOMP #include "wx/dc.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" - BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric) EVT_PAINT(wxStatusBarMac::OnPaint) END_EVENT_TABLE() #ifdef __WXMAC__ -#include "wx/mac/private.h" + #include "wx/mac/private.h" #endif // ============================================================================ diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp index 4f85bebb30..3038c7733f 100644 --- a/src/mac/classic/stattext.cpp +++ b/src/mac/classic/stattext.cpp @@ -17,11 +17,11 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include "wx/notebook.h" #include "wx/tabctrl.h" -#include "wx/dcclient.h" #include "wx/settings.h" #include diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp index 15570d1c09..12059e5f2d 100644 --- a/src/mac/classic/window.cpp +++ b/src/mac/classic/window.cpp @@ -20,10 +20,10 @@ #include "wx/panel.h" #include "wx/frame.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include "wx/menu.h" -#include "wx/dcclient.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/listbox.h" diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp index 4ca45a50a6..9e3d14aa82 100644 --- a/src/mgl/dcclient.cpp +++ b/src/mgl/dcclient.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.cpp +// Name: src/mgl/dcclient.cpp // Purpose: // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -14,8 +14,9 @@ #pragma hdrstop #endif +#include "wx/dcclient.h" + #ifndef WX_PRECOMP - #include "wx/dcclient.h" #include "wx/window.h" #endif @@ -39,7 +40,7 @@ wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win) else { m_inPaintHandler = FALSE; - + dc = new MGLDevCtx(MGL_wmBeginPaint(win->GetHandle())); MGLRegion clip; diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 3d32b54e60..f3b68b1d3f 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -33,10 +33,10 @@ #include "wx/utils.h" #include "wx/frame.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include "wx/menu.h" -#include "wx/dcclient.h" #include "wx/layout.h" #include "wx/button.h" #include "wx/settings.h" diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 24bee18da7..525d9122be 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -31,12 +31,12 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/settings.h" + #include "wx/dcclient.h" #endif #include "wx/textctrl.h" #include "wx/imaglist.h" #include "wx/listctrl.h" -#include "wx/dcclient.h" #include "wx/msw/private.h" diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp index 4ecc52bd13..1c328f7c69 100644 --- a/src/msw/mediactrl.cpp +++ b/src/msw/mediactrl.cpp @@ -36,11 +36,11 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/dcclient.h" #endif #include "wx/math.h" // log10 & pow #include "wx/msw/private.h" // user info and wndproc setting/getting -#include "wx/dcclient.h" #include "wx/timer.h" #include "wx/dynlib.h" diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 72e4008b9a..8f0855822f 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -62,11 +62,11 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/dcclient.h" #endif #include "wx/math.h" // log10 & pow #include "wx/msw/private.h" // user info and wndproc setting/getting -#include "wx/dcclient.h" #include "wx/timer.h" #include "wx/dynlib.h" #include "wx/stopwatch.h" diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index c53ceb0395..f3d26b69d7 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -26,12 +26,12 @@ #include "wx/log.h" #include "wx/event.h" #include "wx/app.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/imaglist.h" #include "wx/control.h" #include "wx/sysopt.h" -#include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/msw/private.h" diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 0c8ec070f4..108bd936b9 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -23,7 +23,10 @@ #pragma hdrstop #endif -#include "wx/dcclient.h" +#ifndef WX_PRECOMP + #include "wx/dcclient.h" +#endif + #include "wx/math.h" // I don't know why members of tagVARIANT aren't found when compiling diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp index 9afea42f73..04d65f63d2 100644 --- a/src/os2/listctrl.cpp +++ b/src/os2/listctrl.cpp @@ -31,12 +31,12 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/settings.h" + #include "wx/dcclient.h" #endif #include "wx/textctrl.h" #include "wx/imaglist.h" #include "wx/listctrl.h" -#include "wx/dcclient.h" #include "wx/os2/private.h" diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 3ec5c73c58..dd3aff2163 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -17,9 +17,9 @@ #ifndef WX_PRECOMP #include "wx/icon.h" #include "wx/window.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" #include "wx/os2/private.h" #include diff --git a/src/palmos/listctrl.cpp b/src/palmos/listctrl.cpp index 2fcaaebea4..ae81853584 100644 --- a/src/palmos/listctrl.cpp +++ b/src/palmos/listctrl.cpp @@ -31,12 +31,12 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/settings.h" + #include "wx/dcclient.h" #endif #include "wx/textctrl.h" #include "wx/imaglist.h" #include "wx/listctrl.h" -#include "wx/dcclient.h" // ---------------------------------------------------------------------------- // events @@ -678,4 +678,3 @@ static void wxDeleteInternalData(wxListCtrl* ctl, long itemId) } #endif // wxUSE_LISTCTRL - diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 80023293d8..57e7fda1c5 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -33,11 +33,11 @@ #include "wx/accel.h" #include "wx/log.h" #include "wx/frame.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/popupwin.h" #include "wx/evtloop.h" -#include "wx/dcclient.h" #include "wx/univ/renderer.h" diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 43bf60080a..f95165004a 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -26,12 +26,12 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/frame.h" + #include "wx/dcclient.h" #endif #include "wx/bitmap.h" #include "wx/statbmp.h" #include "wx/sizer.h" -#include "wx/dcclient.h" #include "wx/image.h" #ifdef __VMS diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp index a7e36d0404..1fb326f439 100644 --- a/src/x11/textctrl.cpp +++ b/src/x11/textctrl.cpp @@ -17,12 +17,12 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/panel.h" + #include "wx/dcclient.h" #endif #include "wx/settings.h" #include "wx/clipbrd.h" #include "wx/tokenzr.h" -#include "wx/dcclient.h" #include "wx/univ/inphand.h" #include "wx/univ/renderer.h" diff --git a/src/x11/window.cpp b/src/x11/window.cpp index c48c7bd02d..a027babec6 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -34,10 +34,10 @@ #include "wx/panel.h" #include "wx/frame.h" #include "wx/dc.h" + #include "wx/dcclient.h" #endif #include "wx/menu.h" -#include "wx/dcclient.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/listbox.h" -- 2.45.2