Include wx/dcclient.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index e3c19e31443c06c06f188099162c7e560b09a7eb..98b1b160a7f974126d6d1801987ac7183b5441a9 100644 (file)
--- 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 1c2b8a2e188af571f8854d000261a49b0592675e..662fcb16df7571d1d3f9f51991b14a5c0cf0b7f6 100644 (file)
--- 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 c5e67adbe2749920dca00367a79dcade82248184..c9d8269869161cc2d5098f281bf5d9dd3d901dfa 100644 (file)
--- 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 b9e554da14270c6530724dd1dedcbcd6f8051b30..752516aa9d1248f35e7e96782cdee7e333d74af0 100644 (file)
--- 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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 442efe3f838407f88706d4b10cd7a59177954be2..53b6270584321450c34b2645f8f97925b6a84637 100644 (file)
--- 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 e17b168167e0d6dfde786bfed121e1bc80c611cc..7695803aab4b8428a4c0f4a14b010a4c035b6f87 100644 (file)
--- 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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index a53683327480208a01bba972be59382afe753e0b..577ecbc4e1615e58d728763662f142675ac6ec01 100644 (file)
--- 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 a679ac635a49f6025186981ddb571939bc2a82b9..4b2c185b3fb9b42b87bef927ebbb7667f5856c0c 100644 (file)
--- 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 6706922aae9173e25d9fbfc81b4ec643470f81fb..1aebe9aac213896677bd31a2c411ef78a1c437ba 100644 (file)
--- 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"

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index dc787ba85a793d88e379e8692d1c2b72166210b8..ef18a5417091760e6c8927ea16cb5219cddcf6b6 100644 (file)
--- 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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index a28e6741a1e0d6232560127b980a51a8121c8e16..4f33dc0d04ad5e59adaf2b0677d2813043eb222d 100644 (file)
--- 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 d7d79ebf1a2a0493bbfed6c08613095f1ca007a9..a63c33eb9ccd6ed77981e184453ed5a9049208ef 100644 (file)
--- 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 bd426249adf86380b3aa3060959b1fb408a13e4c..1deda790eb7f44f9f0167c07790af3fc4cb2bbd8 100644 (file)
--- 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"

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 04be7d66ec9088b393525515850a19c8827a9e63..ebbb1e17b73e305d922f45c4238a972770ca9ce4 100644 (file)
--- 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

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index b34f80b278b854047717e5d0a743fb834a31f0aa..50731776a9f32eaf6cd64911987222ab05bf2e83 100644 (file)
--- 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 78f316c9e9921d4f0f90ea441d5403db4f1e71e1..a36bfe0a103bbeb14a019cafa941bbc619c53bdf 100644 (file)
--- 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 ab652bef8dcd224c521e30fc31ada56bd31cd9fd..417c018cdaea6baaa86eafe1f201fd88dd8788da 100644 (file)
--- 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 90ccac923947a4c00fa8ff286036f6b9ce760a67..3fab91215efdd1bcd5f3749fe6893d0b482654fd 100644 (file)
--- 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 47505c64d7853687d1618d11a8633b3243deb09e..b3464ad2cd030b5e43778a45767858072f52a26f 100644 (file)
--- 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 3799d0cce72a4fe5658d5b4bd49a0aad94921857..6735b1f62b26a7aabab7337f40627617adddbcd4 100644 (file)
--- 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 e7ce2f1633631d9903085bbfcd66d89d09a144fb..7aad88f18ad6ddf633e2f303836d72dc3bf2d6e4 100644 (file)
--- 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 6a8bd124ac4c88ba6234b921af799c6351448491..1ac06835016e2a9b73a6af387431f2f2d37951aa 100644 (file)
--- 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 b87cfc619671715c2dd10855ae6b6b55fd5e54ca..1aea449abc2eea13e80dee149cd4c8b2c606f0b9 100644 (file)
--- 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 e3631536fa9879ee9001ee7a15b26f26eddd636e..736d80406d210c74da7cb6060f1b8d06467a00c0 100644 (file)
--- 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 48775174deaf0bb110ae54a611f484936ed95f08..9e8e3660f6c236a76a81aa2d0513056cad702df0 100644 (file)
--- 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 b54dda7bf19ca9f8829550b4739f356d0102b466..6cd7b8fb01ada98e672d474095e7b006d8f04f9b 100644 (file)
--- 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 0282d8491bab01282edb7888a2bd1efcc35b8568..e34226021d3df534bc58cce93f591c1621106f1f 100644 (file)
--- 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 091ac2b1aa2b23ce48419c6afadc5b79dd23458e..f2a36929af5539d6d91583de1fc6f9801a8d9832 100644 (file)
--- 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 4f85bebb309129dea52d3d44b2190cb82fba1e0e..3038c7733f369ab1f13b94856a1c7b5dd7db9435 100644 (file)
--- 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>

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 15570d1c09c4baaa19e92aef7eafa94f42be0e0b..12059e5f2d385be46dae7dea685c26b4bcb9437b 100644 (file)
--- 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 4ca45a50a6bbc1c84d04ff42519a553c98cbc08c..9e3d14aa82b8e5cc9b8e99276ff98a87ba67f6ac 100644 (file)
--- 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 3d32b54e60d683f2eab35684a12d4d2c2f850700..f3b68b1d3f5c8e2c34fd5d9a76be1e5c7d8bf378 100644 (file)
--- 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 24bee18da7051a64f5274f2725927feebbda48d2..525d9122be7d49f99b4189841ccf71f43a813a42 100644 (file)
--- 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 4ecc52bd13e386c3f06e7224e436e257e88d8fdf..1c328f7c69a511cfc2177b6478e9d0e3082d0a65 100644 (file)
--- 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 72e4008b9aee1a96c8527b846bcf800cb0ec10e1..8f0855822fc4272fd0a65851b890d18968a1d6ab 100644 (file)
--- 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 c53ceb039556f69e35c66147bfed8dfb71e6475b..f3d26b69d78028dc79fd7dd9f23fc01e0648eb49 100644 (file)
--- 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 0c8ec070f418e07da520cc63c1d20cff4cafa5bb..108bd936b982096aecd4cd3e4d02e00968e89a77 100644 (file)
--- 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 9afea42f730a685d01e5b6947ff8ee1a473a0690..04d65f63d26192de55b9b81325dc0224ff923ea5 100644 (file)
--- 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 3ec5c73c5818ce7268cbf2f66606c09599c7dcf9..dd3aff216347f511e5edb6cb526e62208b4e2422 100644 (file)
--- 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>

diff --git a/src/palmos/listctrl.cpp b/src/palmos/listctrl.cpp
index 2fcaaebea40292928ca871770da7d4ec38b4f66d..ae81853584fa55ad19ea0c73ba5c00c9f4637975 100644 (file)
--- 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 80023293d8314af45d79022ca1b4c637a1f5d665..57e7fda1c5709a5c1834db8f1aa2c112a5a06bc7 100644 (file)
--- 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 43bf60080ab21511a3f391db36a9fcd7f47fc6e8..f95165004a7c34fb78ec29d3e14083aa49e23f97 100644 (file)
--- 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 a7e36d04043cb7c1dec591eea6f9cfc67f972c0b..1fb326f439e4e4f8c94a9c7dbb659f1373b361c5 100644 (file)
--- 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 c48c7bd02d1214aa0d420e80490cace0d498bef7..a027babec61f78e578bbcf1e9f7f327a75a75779 100644 (file)
--- 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"