Include wx/window.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

src/gtk/data.cpp

@@ -12,9 +12,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/cursor.h"
 

src/gtk/dcscreen.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.cpp
+// Name:        src/gtk/dcscreen.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -33,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
 
 wxScreenDC::wxScreenDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
     m_cmap = gdk_colormap_get_system();
     m_window = gdk_get_default_root_window();
 
@@ -44,7 +47,7 @@ wxScreenDC::wxScreenDC()
     m_layout = pango_layout_new( m_context );
 //    m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
-    m_isScreenDC = TRUE;
+    m_isScreenDC = true;
 
     SetUpDC();
 

src/gtk/dnd.cpp

@@ -19,9 +19,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gtk/private.h"

src/gtk/renderer.cpp

@@ -25,10 +25,14 @@
 #endif
 
 #include "wx/renderer.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
-#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/settings.h"
@@ -436,7 +440,7 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     DrawDropArrow(win,dc,rect);
 }
 
-void 
+void
 wxRendererGTK::DrawCheckBox(wxWindow *win,
                             wxDC& dc,
                             const wxRect& rect,
@@ -468,8 +472,8 @@ wxRendererGTK::DrawCheckBox(wxWindow *win,
         NULL,
         button,
         "cellcheck",
-        dc.LogicalToDeviceX(rect.x)+2, 
+        dc.LogicalToDeviceX(rect.x)+2,
-        dc.LogicalToDeviceY(rect.y)+3, 
+        dc.LogicalToDeviceY(rect.y)+3,
         13, 13
     );
 }
@@ -511,11 +515,11 @@ wxRendererGTK::DrawPushButton(wxWindow *win,
     );
 }
 
-void 
+void
 wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
-                                       wxDC& dc,
+                                     wxDC& dc,
-                                       const wxRect& rect,
+                                     const wxRect& rect,
-                                       int flags )
+                                     int flags )
 {
     // for reason why we do this, see DrawDropArrow
     wxWindowDC& wdc = (wxWindowDC&)dc;
@@ -533,7 +537,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                         GTK_PIZZA(win->m_wxwindow)->bin_window,
                         state,
                         GTK_SHADOW_NONE,
-                        NULL, 
+                        NULL,
                         win->m_wxwindow,
                         "treeview",
                         dc.LogicalToDeviceX(rect.x),

src/gtk/tooltip.cpp

@@ -13,7 +13,10 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include "wx/gtk/private.h"
 
@@ -52,7 +55,7 @@ void wxToolTip::Apply( wxWindow *win )
 
     m_window = win;
 
-    if (m_text.IsEmpty())
+    if (m_text.empty())
         m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
@@ -83,4 +86,4 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
 
-#endif
+#endif // wxUSE_TOOLTIPS

src/gtk1/data.cpp

@@ -12,9 +12,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/cursor.h"
 

src/gtk1/dcscreen.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.cpp
+// Name:        src/gtk1/dcscreen.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -33,11 +36,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
 
 wxScreenDC::wxScreenDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
     m_cmap = gdk_colormap_get_system();
     m_window = GDK_ROOT_PARENT();
 
-    m_isScreenDC = TRUE;
+    m_isScreenDC = true;
 
     SetUpDC();
 

src/gtk1/dnd.cpp

@@ -19,9 +19,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gtk1/private.h"

src/gtk1/renderer.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/renderer.cpp
+// Name:        src/gtk1/renderer.cpp
 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,10 +25,14 @@
 #endif
 
 #include "wx/renderer.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
 #include <gtk/gtk.h>
 #include "wx/gtk1/win_gtk.h"
 
-#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 

src/gtk1/tooltip.cpp

@@ -13,7 +13,10 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include "wx/gtk1/private.h"
 
@@ -52,7 +55,7 @@ void wxToolTip::Apply( wxWindow *win )
 
     m_window = win;
 
-    if (m_text.IsEmpty())
+    if (m_text.empty())
         m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );

src/mac/carbon/app.cpp

@@ -17,9 +17,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"

src/mac/carbon/bmpbuttn.cpp

@@ -13,21 +13,24 @@
 
 #if wxUSE_BMPBUTTON
 
-#include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #include "wx/mac/uma.h"
 #include "wx/bitmap.h"
 
 bool wxBitmapButton::Create( wxWindow *parent,
-    wxWindowID id, const wxBitmap& bitmap,
+                             wxWindowID id, const wxBitmap& bitmap,
-    const wxPoint& pos,
+                             const wxPoint& pos,
-    const wxSize& size,
+                             const wxSize& size,
-    long style,
+                             long style,
-    const wxValidator& validator,
+                             const wxValidator& validator,
-    const wxString& name )
+                             const wxString& name )
 {
     m_macIsUserPane = false;
 
@@ -55,9 +58,9 @@ bool wxBitmapButton::Create( wxWindow *parent,
     if ( bitmap.Ok() )
     {
         wxSize newSize = DoGetBestSize();
-        if ( width == -1 )
+        if ( width == wxDefaultCoord )
             width = newSize.x;
-        if ( height == -1 )
+        if ( height == wxDefaultCoord )
             height = newSize.y;
     }
 

src/mac/carbon/dcclient.cpp

@@ -15,11 +15,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/dcmemory.h"
 #include "wx/region.h"
-#include "wx/window.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"
 #include "wx/math.h"

src/mac/carbon/dnd.cpp

@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif // WX_PRECOMP
 
-#include "wx/window.h"
 #include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"

src/mac/carbon/menu.cpp

@@ -24,10 +24,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/menuitem.h"
-#include "wx/window.h"
 #include "wx/log.h"
 #include "wx/frame.h"
 

src/mac/carbon/tooltip.cpp

@@ -15,10 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif // WX_PRECOMP
 
 #include "wx/dc.h"
-#include "wx/window.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"

src/mac/classic/app.cpp

@@ -21,9 +21,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"

src/mac/classic/bmpbuttn.cpp

@@ -1,17 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbuttn.cpp
+// Name:        src/mac/classic/bmpbuttn.cpp
 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/window.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON
+
 #include "wx/bmpbuttn.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #include "wx/mac/uma.h"
@@ -30,7 +37,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
         return false;
 
     m_bmpNormal = bitmap;
- 
+
     if (style & wxBU_AUTODRAW)
     {
         m_marginX = wxDEFAULT_BUTTON_MARGIN;
@@ -58,19 +65,19 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     Str255 title ;
     m_bmpNormal = bitmap;
     wxBitmapRefData * bmap = NULL ;
-    
+
     if ( m_bmpNormal.Ok() )
         bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
-    
+
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 ,
-        kControlBehaviorOffsetContents + 
+        kControlBehaviorOffsetContents +
-            ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ? 
+            ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ?
-            kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
+            kControlContentCIconHandle : kControlContentPictHandle ) , 0,
           (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
-    
+
     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
     if ( info.contentType != kControlNoContent )
@@ -79,7 +86,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     }
     MacPostControlCreate() ;
 
-    return TRUE;
+    return true;
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
@@ -106,3 +113,5 @@ wxSize wxBitmapButton::DoGetBestSize() const
     }
     return best;
 }
+
+#endif // wxUSE_BMPBUTTON

src/mac/classic/dcclient.cpp

@@ -1,18 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.cpp
+// Name:        src/mac/classic/dcclient.cpp
 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
 #include "wx/dcmemory.h"
 #include "wx/region.h"
-#include "wx/window.h"
 #include "wx/toplevel.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"
@@ -37,17 +43,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 
 #include "wx/mac/uma.h"
 
-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()
 {
     m_window = NULL ;
 }
 
-wxWindowDC::wxWindowDC(wxWindow *window) 
+wxWindowDC::wxWindowDC(wxWindow *window)
 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    
+
     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
@@ -57,7 +63,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = TRUE ;
+    m_ok = true ;
     SetBackground(window->MacGetBackgroundBrush());
 }
 
@@ -103,7 +109,7 @@ wxClientDC::wxClientDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 
-    m_ok = TRUE ;
+    m_ok = true ;
     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }
@@ -150,7 +156,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 
-    m_ok = TRUE ;
+    m_ok = true ;
     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }
@@ -165,5 +171,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
 
     m_window->GetClientSize( width, height );
 }
-
-

src/mac/classic/dnd.cpp

@@ -21,9 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif // WX_PRECOMP
 
-#include "wx/window.h"
 #include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"

src/mac/classic/menu.cpp

@@ -24,10 +24,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/menuitem.h"
-#include "wx/window.h"
 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"

src/mac/classic/tooltip.cpp

@@ -19,10 +19,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/dc.h"
-#include "wx/window.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
@@ -408,4 +408,4 @@ void wxMacToolTip::Clear()
 #endif
 }
 
-#endif
+#endif // wxUSE_TOOLTIPS

src/mac/corefoundation/hidjoystick.cpp

@@ -34,11 +34,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"   //joystick wxEvents
+    #include "wx/window.h"  //for wxWindow to "capture" joystick
 #endif
 
 #include "wx/joystick.h"    //...
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
-#include "wx/window.h"      //for wxWindow to "capture" joystick
 
 //private headers
 #include "wx/mac/corefoundation/hid.h" //private mac hid stuff

src/motif/cursor.cpp

@@ -21,10 +21,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 #if wxUSE_IMAGE
     #include "wx/image.h"
 #endif

src/motif/dcclient.cpp

@@ -44,10 +44,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/dcmemory.h"
-#include "wx/window.h"
 #include "wx/image.h"
 #include "wx/math.h"
 

src/motif/dcscreen.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/frame.h"
 
 #ifdef __VMS__

src/motif/dnd.cpp

@@ -19,9 +19,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/gdicmn.h"
 
 #include <X11/Xlib.h>

src/motif/evtloop.cpp

@@ -28,10 +28,10 @@
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-#include "wx/window.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/motif/palette.cpp

@@ -42,10 +42,9 @@ not the functionality that wxPalette::Create() aims to provide.
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

src/msw/dcclient.cpp

@@ -29,10 +29,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------

src/msw/joystick.cpp

@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/msw/private.h"
 
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
@@ -36,7 +36,6 @@
 #define NO_JOYGETPOSEX
 #endif
 
-#include "wx/window.h"
 #include "wx/msw/registry.h"
 
 #include <regstr.h>

src/msw/listbox.cpp

@@ -27,9 +27,9 @@
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/msw/private.h"
 
 #include <windowsx.h>

src/msw/statbmp.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/msw/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:
@@ -26,14 +26,15 @@
 
 #if wxUSE_STATBMP
 
-#include "wx/window.h"
+#include "wx/statbmp.h"
-#include "wx/msw/private.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/window.h"
     #include "wx/icon.h"
-    #include "wx/statbmp.h"
 #endif
 
+#include "wx/msw/private.h"
+
 #include "wx/sysopt.h"
 
 #include <stdio.h>
@@ -276,9 +277,9 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
     if (m_currentHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle)
     {
         // the static control made a copy and we are responsible for deleting it
-        DeleteObject((HGDIOBJ) oldHandle);      
+        DeleteObject((HGDIOBJ) oldHandle);
     }
-    m_currentHandle = (WXHANDLE)handle;                  	
+    m_currentHandle = (WXHANDLE)handle;
 #endif // Win32
 
     if ( ImageIsOk() )
@@ -303,4 +304,3 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 }
 
 #endif // wxUSE_STATBMP
-

src/os2/checklst.cpp

@@ -23,12 +23,12 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/bitmap.h"
-#include "wx/window.h"
 #include "wx/listbox.h"
 #include "wx/ownerdrw.h"
 #include "wx/settings.h"

src/os2/dcclient.cpp

@@ -26,10 +26,9 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 #include "wx/os2/private.h"
 
 // ----------------------------------------------------------------------------

src/os2/dcprint.cpp

@@ -26,9 +26,9 @@
     #include "wx/math.h"
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)

src/os2/dnd.cpp

@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/gdicmn.h"
 
 #define INCL_PM

src/os2/joystick.cpp

@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
 #define INCL_PM
@@ -26,8 +27,6 @@
 
 #define NO_JOYGETPOSEX
 
-#include "wx/window.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes

src/os2/listbox.cpp

@@ -26,9 +26,9 @@
     #include "wx/utils.h"
     #include "wx/scrolwin.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
 #define INCL_M

src/os2/region.cpp

@@ -14,12 +14,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/os2/region.h"
 #include "wx/gdicmn.h"
 
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)

src/os2/settings.cpp

@@ -17,11 +17,11 @@
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/gdicmn.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/module.h"
 #include "wx/settings.h"
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
 // the module which is used to clean up wxSystemSettings data (this is a

src/os2/statbmp.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/os2/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      David Webster
 // Modified by:
@@ -12,15 +12,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/dcclient.h"
+#include "wx/statbmp.h"
-#include "wx/window.h"
-#include "wx/os2/private.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
-    #include "wx/statbmp.h"
+    #include "wx/window.h"
 #endif
 
+#include "wx/dcclient.h"
+#include "wx/os2/private.h"
+
 #include <stdio.h>
 
 // ---------------------------------------------------------------------------
@@ -119,7 +120,7 @@ bool wxStaticBitmap::Create( wxWindow*         pParent,
         sError = wxPMErrorToStr(vError);
         return false;
     }
-    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+    wxCHECK_MSG( m_hWnd, false, wxT("Failed to create static bitmap") );
     m_pImage = ConvertImage(rBitmap);
     ::WinSendMsg(   m_hWnd,
                     SM_SETHANDLE,
@@ -154,12 +155,10 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
-void wxStaticBitmap::OnPaint (
+void wxStaticBitmap::OnPaint ( wxPaintEvent& WXUNUSED(rEvent) )
-  wxPaintEvent&                     WXUNUSED(rEvent)
-)
 {
-    wxPaintDC                       vDc(this);
+    wxPaintDC vDc(this);
-    wxBitmap*                       pBitmap;
+    wxBitmap* pBitmap;
 
     if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))
     {
@@ -177,14 +176,12 @@ void wxStaticBitmap::OnPaint (
     }
 } // end of wxStaticBitmap::OnPaint
 
-void wxStaticBitmap::SetImage(
+void wxStaticBitmap::SetImage( const wxGDIImage& rBitmap )
-  const wxGDIImage&                 rBitmap
-)
 {
-    int                             nX = 0;
+    int nX = 0;
-    int                             nY = 0;
+    int nY = 0;
-    int                             nWidth = 0;
+    int nWidth = 0;
-    int                             nHeight = 0;
+    int nHeight = 0;
 
     Free();
     ::WinSendMsg( GetHwnd()

src/os2/statbox.cpp

@@ -17,9 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)

src/palmos/dcclient.cpp

@@ -29,10 +29,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 // ----------------------------------------------------------------------------
 // array/list types
 // ----------------------------------------------------------------------------

src/palmos/joystick.cpp

@@ -18,10 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes

src/palmos/listbox.cpp

@@ -28,9 +28,9 @@
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/palmos/private.h"
 
 #if wxUSE_OWNER_DRAWN

src/palmos/statbmp.cpp

@@ -26,14 +26,15 @@
 
 #if wxUSE_STATBMP
 
-#include "wx/window.h"
+#include "wx/statbmp.h"
-#include "wx/palmos/private.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
-    #include "wx/statbmp.h"
+    #include "wx/window.h"
 #endif
 
+#include "wx/palmos/private.h"
+
 // ---------------------------------------------------------------------------
 // macors
 // ---------------------------------------------------------------------------

src/palmos/window.cpp

@@ -77,7 +77,6 @@
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"
-#include "wx/window.h"
 
 #include <Window.h>
 

src/unix/joystick.cpp

@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/event.h"
+    #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include <linux/joystick.h>
@@ -28,7 +29,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "wx/window.h"
 #include "wx/unix/private.h"
 
 enum {

src/x11/dcclient.cpp

@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/dcmemory.h"
-#include "wx/window.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"

src/x11/dcscreen.cpp

@@ -17,9 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/fontutil.h"
 

src/x11/dnd.cpp

@@ -23,9 +23,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/gdicmn.h"
 
 #include <X11/Xlib.h>

src/x11/evtloop.cpp

@@ -25,9 +25,9 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/tooltip.h"
 #include "wx/timer.h"
 #include "wx/module.h"

src/x11/icon.cpp

@@ -1,16 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/x11/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/icon.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include "wx/x11/private.h"
 

src/x11/palette.cpp

@@ -42,10 +42,9 @@ not the functionality that wxPalette::Create() aims to provide.
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

src/x11/utils.cpp

@@ -28,12 +28,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/window.h" // for wxTopLevelWindows
 #endif
 
 #include "wx/apptrait.h"
 #include "wx/msgdlg.h"
 #include "wx/cursor.h"
-#include "wx/window.h" // for wxTopLevelWindows
 
 #include <ctype.h>
 #include <stdarg.h>

src/xrc/xh_unkwn.cpp

@@ -21,9 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/sizer.h"
 #include "wx/panel.h"