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
2006-05-06 21:51:49 +00:00 · 2006-05-06 21:51:49 +00:00 · ed4b0fdca6
commit ed4b0fdca6
parent 23f4f495a5
44 changed files with 85 additions and 76 deletions
--- 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
--- 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"
--- 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"

 // ----------------------------------------------------------------------------
--- 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 <stdlib.h>

 #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
--- 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"

--- 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 <gtk/gtk.h>
 #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
--- 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"

--- 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) );
--- 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 <glib.h>
 #include "wx/gtk/private.h"
--- 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 <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"

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

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

--- 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"

--- 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,
        }
    }
 }
-
--- 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
-
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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;
--- 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

 // ============================================================================
--- 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 <stdio.h>
--- 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"
--- 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;
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- 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
--- 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"

--- 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 <stdio.h>
--- 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
-
--- 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"

--- 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
--- 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"
--- 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"