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

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

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 51f339fb83179df492ed4a22b8cd32bd9da4c660..714d5169c51ebfd91fcee5cd953e0f5d3b1396e1 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -12,9 +12,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/dc.h"
 #include "wx/cursor.h"
 
 #include "wx/dc.h"
 #include "wx/cursor.h"
 

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 3e0d46d5bb1d3baf80d6801f9093107a99da1a0c..8e00545f96bc17c95d690dbd4e05895e9af073a7 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/gtk/dcscreen.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
 #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>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>


@@ -33,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
 
 wxScreenDC::wxScreenDC()
 {
 
 wxScreenDC::wxScreenDC()
 {

-    m_ok = FALSE;
+    m_ok = false;

     m_cmap = gdk_colormap_get_system();
     m_window = gdk_get_default_root_window();
 
     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_layout = pango_layout_new( m_context );
 //    m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 

-    m_isScreenDC = TRUE;
+    m_isScreenDC = true;

 
     SetUpDC();
 
 
     SetUpDC();
 

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index b199481b30ee99356e3cc3a24bb15bb6a646a231..ffd858bc7671da6c176f725146564777467ed252 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -19,9 +19,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/gdicmn.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gtk/private.h"

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index b86627af6357bd485c49fac91450be4c487ba5ae..b2ac87afaf6adb06a11dc3bfe0105cd1a0b786c3 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -25,10 +25,14 @@
 #endif
 
 #include "wx/renderer.h"
 #endif
 
 #include "wx/renderer.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+

 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #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"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/settings.h"


@@ -436,7 +440,7 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     DrawDropArrow(win,dc,rect);
 }
 
     DrawDropArrow(win,dc,rect);
 }
 

-void 
+void

 wxRendererGTK::DrawCheckBox(wxWindow *win,
                             wxDC& dc,
                             const wxRect& rect,
 wxRendererGTK::DrawCheckBox(wxWindow *win,
                             wxDC& dc,
                             const wxRect& rect,


@@ -468,8 +472,8 @@ wxRendererGTK::DrawCheckBox(wxWindow *win,
         NULL,
         button,
         "cellcheck",
         NULL,
         button,
         "cellcheck",

-        dc.LogicalToDeviceX(rect.x)+2, 
-        dc.LogicalToDeviceY(rect.y)+3, 
+        dc.LogicalToDeviceX(rect.x)+2,
+        dc.LogicalToDeviceY(rect.y)+3,

         13, 13
     );
 }
         13, 13
     );
 }


@@ -511,11 +515,11 @@ wxRendererGTK::DrawPushButton(wxWindow *win,
     );
 }
 
     );
 }
 

-void 
+void

 wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
 wxRendererGTK::DrawItemSelectionRect(wxWindow *win,

-                                       wxDC& dc,
-                                       const wxRect& rect,
-                                       int flags )
+                                     wxDC& dc,
+                                     const wxRect& rect,
+                                     int flags )

 {
     // for reason why we do this, see DrawDropArrow
     wxWindowDC& wdc = (wxWindowDC&)dc;
 {
     // 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,
                         GTK_PIZZA(win->m_wxwindow)->bin_window,
                         state,
                         GTK_SHADOW_NONE,

-                        NULL, 
+                        NULL,

                         win->m_wxwindow,
                         "treeview",
                         dc.LogicalToDeviceX(rect.x),
                         win->m_wxwindow,
                         "treeview",
                         dc.LogicalToDeviceX(rect.x),

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index e0d3bd03fa6db92227dd15a1e3875a710f09376b..bce18195c1841891952310827d253216fbd17738 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -13,7 +13,10 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"

-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 


@@ -52,7 +55,7 @@ void wxToolTip::Apply( wxWindow *win )
 
     m_window = 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 );
         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 );
 }
 
     gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
 

-#endif
+#endif // wxUSE_TOOLTIPS

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 96193525eb5b3eb70a30b47c214f0515bdcb48d0..48730c7ec978231ec0b4cc76a2dd4de868bb1a89 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -12,9 +12,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/dc.h"
 #include "wx/cursor.h"
 
 #include "wx/dc.h"
 #include "wx/cursor.h"
 

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index dbd3a29229b6469beec629de5fb0fd229cc7cc36..7797f9439497d69eebbbff1901a6a821d4b2990e 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/gtk1/dcscreen.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
 #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>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>


@@ -33,11 +36,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
 
 wxScreenDC::wxScreenDC()
 {
 
 wxScreenDC::wxScreenDC()
 {

-    m_ok = FALSE;
+    m_ok = false;

     m_cmap = gdk_colormap_get_system();
     m_window = GDK_ROOT_PARENT();
 
     m_cmap = gdk_colormap_get_system();
     m_window = GDK_ROOT_PARENT();
 

-    m_isScreenDC = TRUE;
+    m_isScreenDC = true;

 
     SetUpDC();
 
 
     SetUpDC();
 

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 1d128192e15072de1eb0c2674baac771ef72451f..becc53af147002f8940f251ae63121f2b30c87c7 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -19,9 +19,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/gdicmn.h"
 
 #include "wx/gtk1/private.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gtk1/private.h"

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 65efb88eae9a472a8ee2cfc73ef891a00dac578a..43b904d76027728dd70225ca1159027dd342dd90 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/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:
 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,10 +25,14 @@
 #endif
 
 #include "wx/renderer.h"
 #endif
 
 #include "wx/renderer.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+

 #include <gtk/gtk.h>
 #include "wx/gtk1/win_gtk.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk1/win_gtk.h"
 

-#include "wx/window.h"

 #include "wx/dc.h"
 #include "wx/dcclient.h"
 
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 0ac2a8b1da30316c629e5ad7f499d15227105a3e..141f3bc17d53e4508007aedbe18d0c07468d0e11 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -13,7 +13,10 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"

-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif

 
 #include "wx/gtk1/private.h"
 
 
 #include "wx/gtk1/private.h"
 


@@ -52,7 +55,7 @@ void wxToolTip::Apply( wxWindow *win )
 
     m_window = 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 );
         m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 4a80a2817de3510b76872dbe1334c59fef6728b1..3487a763de3f5c1f1c55a81c0bde4bfaa9dc9b3a 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -17,9 +17,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 48fec8aac677ac507d8e7c50ffb204f947c2faf2..2df9569de4235680e07a6ec2a0c0027c354c2fd4 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -13,21 +13,24 @@
 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

-#include "wx/window.h"

 #include "wx/bmpbuttn.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,
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #include "wx/mac/uma.h"
 #include "wx/bitmap.h"
 
 bool wxBitmapButton::Create( wxWindow *parent,

-    wxWindowID id, const wxBitmap& bitmap,
-    const wxPoint& pos,
-    const wxSize& size,
-    long style,
-    const wxValidator& validator,
-    const wxString& name )
+                             wxWindowID id, const wxBitmap& bitmap,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxValidator& validator,
+                             const wxString& name )

 {
     m_macIsUserPane = false;
 
 {
     m_macIsUserPane = false;
 


@@ -55,9 +58,9 @@ bool wxBitmapButton::Create( wxWindow *parent,
     if ( bitmap.Ok() )
     {
         wxSize newSize = DoGetBestSize();
     if ( bitmap.Ok() )
     {
         wxSize newSize = DoGetBestSize();

-        if ( width == -1 )
+        if ( width == wxDefaultCoord )

             width = newSize.x;
             width = newSize.x;

-        if ( height == -1 )
+        if ( height == wxDefaultCoord )

             height = newSize.y;
     }
 
             height = newSize.y;
     }
 

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 24e5d95e30e9234b734082559f5b3dc67c3dc2da..f706434036799f99d1193e9da44a50d61957b73d 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -15,11 +15,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/dcmemory.h"
 #include "wx/region.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"
 #include "wx/toplevel.h"
 #include "wx/settings.h"
 #include "wx/math.h"

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 22cef52744b114be17acfb56cc155811297ed28e..ab82e4c481ad8c3a746c986cb45ab78c682224d8 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/window.h"

 #include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 #include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 94f29966bcfeb98a079aacb8e603512c25b620f9..fec068407db8b95a68e27063542ee7d5ea5ca203 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -24,10 +24,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/window.h"

 #include "wx/log.h"
 #include "wx/frame.h"
 
 #include "wx/log.h"
 #include "wx/frame.h"
 

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index d2038b876b53e3e218cae65ea8593a10d6aafb56..8ffbb4101a6009087cc2b48a2e2c26f9c36ce1e9 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -15,10 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif // WX_PRECOMP
 
 #include "wx/dc.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"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 5f4fb9e612696ebe0539053acddb24f0ed73dfab..f7359bc924de511878d2cecc91f7f68e701484fc 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -21,9 +21,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"

diff --git a/src/mac/classic/bmpbuttn.cpp b/src/mac/classic/bmpbuttn.cpp
index a5ac7c63045618f499092866b1a9fdaeb1a677fe..be7783beb6ead258b154817dc642bd7702acd2d8 100644 (file)
--- a/src/mac/classic/bmpbuttn.cpp
+++ b/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
 // 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"
 
 #include "wx/bmpbuttn.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #include "wx/mac/uma.h"
 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;
         return false;
 
     m_bmpNormal = bitmap;

- 
+

     if (style & wxBU_AUTODRAW)
     {
         m_marginX = wxDEFAULT_BUTTON_MARGIN;
     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 ;
     Str255 title ;
     m_bmpNormal = bitmap;
     wxBitmapRefData * bmap = NULL ;

-    
+

     if ( m_bmpNormal.Ok() )
         bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
     if ( m_bmpNormal.Ok() )
         bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;

-    
+

     MacPreControlCreate( parent , id ,  wxEmptyString , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
     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 , 
-        kControlBehaviorOffsetContents + 
-            ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ? 
-            kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 ,
+        kControlBehaviorOffsetContents +
+            ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ?
+            kControlContentCIconHandle : kControlContentPictHandle ) , 0,

           (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
           (( 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 )
     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() ;
 
     }
     MacPostControlCreate() ;
 

-    return TRUE;
+    return true;

 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)


@@ -106,3 +113,5 @@ wxSize wxBitmapButton::DoGetBestSize() const
     }
     return best;
 }
     }
     return best;
 }

+
+#endif // wxUSE_BMPBUTTON

diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp
index 6c8fbe9f18a21af50e7355b29df14592a3e45780..747423c2593a70a710802eebb76b09c9cbb89664 100644 (file)
--- a/src/mac/classic/dcclient.cpp
+++ b/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
 // 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"
 #include "wx/dcclient.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+

 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #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"
 #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"
 
 
 #include "wx/mac/uma.h"
 

-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()

 {
     m_window = NULL ;
 }
 
 {
     m_window = NULL ;
 }
 

-wxWindowDC::wxWindowDC(wxWindow *window) 
+wxWindowDC::wxWindowDC(wxWindow *window)

 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;

-    
+

     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
     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 ) ;
     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());
 }
 
     SetBackground(window->MacGetBackgroundBrush());
 }
 


@@ -103,7 +109,7 @@ wxClientDC::wxClientDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 

-    m_ok = TRUE ;
+    m_ok = true ;

     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }
     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 ) ;
 
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 

-    m_ok = TRUE ;
+    m_ok = true ;

     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }
     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }


@@ -165,5 +171,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
 
     m_window->GetClientSize( width, height );
 }
 
     m_window->GetClientSize( width, height );
 }

-
-

diff --git a/src/mac/classic/dnd.cpp b/src/mac/classic/dnd.cpp
index 5acd609b19782c2e12ac275b2590eb572861ef00..43cc599f1af61953e3de57692c20f2ee75f17941 100644 (file)
--- a/src/mac/classic/dnd.cpp
+++ b/src/mac/classic/dnd.cpp
@@ -21,9 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/window.h"

 #include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 #include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index 66a7365a55485b36ab93eedddd7a4ce78140d3f9..12cba13bf229cfb0c6951ed79b6dfbf38f2efbce 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -24,10 +24,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/window.h"

 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"
 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/tooltip.cpp b/src/mac/classic/tooltip.cpp
index 5c2424b150bbc93cbb98bba8ac013aa66b91e344..cca96f416c5b5378dabc223c9de1c54096a824e1 100644 (file)
--- a/src/mac/classic/tooltip.cpp
+++ b/src/mac/classic/tooltip.cpp
@@ -19,10 +19,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/dc.h"
 #endif
 
 #include "wx/dc.h"

-#include "wx/window.h"

 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"


@@ -408,4 +408,4 @@ void wxMacToolTip::Clear()
 #endif
 }
 
 #endif
 }
 

-#endif
+#endif // wxUSE_TOOLTIPS

diff --git a/src/mac/corefoundation/hidjoystick.cpp b/src/mac/corefoundation/hidjoystick.cpp
index ee7178d643bee2703b3d67910baf79a4a608b548..d9be35e3428b98f01d40320fa156a65648e63824 100644 (file)
--- a/src/mac/corefoundation/hidjoystick.cpp
+++ b/src/mac/corefoundation/hidjoystick.cpp
@@ -34,11 +34,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"   //joystick wxEvents
 #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
 #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
 
 //private headers
 #include "wx/mac/corefoundation/hid.h" //private mac hid stuff

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index fdcb917d393ed4bd74ddcd4ef57baf2c48a3c2b4..11c30421c7d75f157938b61edf9cc651c0ad5d5b 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -21,10 +21,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 #if wxUSE_IMAGE
     #include "wx/image.h"
 #endif
 #if wxUSE_IMAGE
     #include "wx/image.h"
 #endif

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index a6891893819a5494477d7630477cb2126777608f..eef4a0aa7dba678110fe1e6775e9b992621daee8 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -44,10 +44,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/dcmemory.h"
 #endif
 
 #include "wx/dcmemory.h"

-#include "wx/window.h"

 #include "wx/image.h"
 #include "wx/math.h"
 
 #include "wx/image.h"
 #include "wx/math.h"
 

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index d3852432541d28315dce79fc406071727fac9d16..10b0fb0acc657faf4573c72cfd9361e3e205dd8b 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/frame.h"
 
 #ifdef __VMS__
 #include "wx/frame.h"
 
 #ifdef __VMS__

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index aac3b27102b8dba5e6b50f3d235b5d7d70027412..8cb7763047f3f6a6d5d77388c12218f7fadaab60 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -19,9 +19,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/gdicmn.h"
 
 #include <X11/Xlib.h>
 #include "wx/gdicmn.h"
 
 #include <X11/Xlib.h>

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 0d5a12fbf2a6e129d3e30467216173158b0295ae..4271f4577c0cd07b25b8692f2a24a233cc206da0 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -28,10 +28,10 @@
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

-#include "wx/window.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp
index 12cf5a31ddf29cbdc327ada51161a155ae2cfd31..378172ff5b06e79122042772bd81e2c569a708fe 100644 (file)
--- a/src/motif/palette.cpp
+++ b/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"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 890f27dffd0b6cd3c03af64fc094abe62805f4d7..05685aa39f165e7c0e4713b120402c233ad2c099 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -29,10 +29,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 51e617809459baca011d51245d147ac6fa6b5196..78e023fd737eb9d6d350ce796dcfd7e38a52fea7 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/msw/private.h"
 
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
 #include "wx/msw/private.h"
 
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)


@@ -36,7 +36,6 @@
 #define NO_JOYGETPOSEX
 #endif
 
 #define NO_JOYGETPOSEX
 #endif
 

-#include "wx/window.h"

 #include "wx/msw/registry.h"
 
 #include <regstr.h>
 #include "wx/msw/registry.h"
 
 #include <regstr.h>

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index e9e500591e790bd8514019e867124d89eaa373ff..f2507cf98f627a9f4289b731b2c47ae4be34f0e6 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -27,9 +27,9 @@
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/msw/private.h"
 
 #include <windowsx.h>
 #include "wx/msw/private.h"
 
 #include <windowsx.h>

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index c321fe5f73c680ad9b7c27fbffe178b9c2b30908..26a32bf03b6a2ff351329f10fd539b73d8b2a7c0 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.cpp
+// Name:        src/msw/statbmp.cpp

 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:


@@ -26,14 +26,15 @@
 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 

-#include "wx/window.h"
-#include "wx/msw/private.h"
+#include "wx/statbmp.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/window.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

-    #include "wx/statbmp.h"

 #endif
 
 #endif
 

+#include "wx/msw/private.h"
+

 #include "wx/sysopt.h"
 
 #include <stdio.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
     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() )
 #endif // Win32
 
     if ( ImageIsOk() )


@@ -303,4 +304,3 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 }
 
 #endif // wxUSE_STATBMP
 }
 
 #endif // wxUSE_STATBMP

-

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 692eafb574dba1627251c35864dc0d5ec416fd29..ed0d2e3f36f0f38bc9a8914f0702f88e977d5e73 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -23,12 +23,12 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/log.h"
 #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"
 #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"
 #include "wx/listbox.h"
 #include "wx/ownerdrw.h"
 #include "wx/settings.h"

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 74423dfaf2b7f6457a61f64ff8fe3e22fd536db3..abc17ca2bb635539f6731344c79f1105fb71f03c 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -26,10 +26,9 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 #include "wx/os2/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/os2/private.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index edd3969173a6fd5e30eaae9699c1a852fdb614cb..c6e79fdb526f449a54df047c8b92d9c08b427754 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -26,9 +26,9 @@
     #include "wx/math.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/math.h"
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/os2/private.h"
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 #include "wx/os2/private.h"
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 9d277bfadea7fbd79c628cce769be93c898faa9c..0f61318b7756f2cf992054dcb396967f5c7e4b27 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/gdicmn.h"
 
 #define INCL_PM
 #include "wx/gdicmn.h"
 
 #define INCL_PM

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index c86cb881a63d933c343c89a483944e150621aea5..2117fd31e3f3616ed94b06519cc418aff4b1b254 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/window.h"

 #endif
 
 #define INCL_PM
 #endif
 
 #define INCL_PM


@@ -26,8 +27,6 @@
 
 #define NO_JOYGETPOSEX
 
 
 #define NO_JOYGETPOSEX
 

-#include "wx/window.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 11e6a92bc7e354fccb46be6f2e98eb3d71b95a13..ae9fc4101aff2677635cd3836c9f2e174506b2c8 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -26,9 +26,9 @@
     #include "wx/utils.h"
     #include "wx/scrolwin.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/scrolwin.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/os2/private.h"
 
 #define INCL_M
 #include "wx/os2/private.h"
 
 #define INCL_M

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index 012ed66e87d816293c39e824870fbd5543bf55bd..a0723c007389142b32bb6442d58e349fd0de5228 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -14,12 +14,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/os2/region.h"
 #include "wx/gdicmn.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)
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 805e567da7c3a9687ff7765237c94c7e79224f56..a190d277d0a96b789e6c30c8c11e024ef1db4919 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -17,11 +17,11 @@
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/gdicmn.h"
     #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"
 #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
 #include "wx/os2/private.h"
 
 // the module which is used to clean up wxSystemSettings data (this is a

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 304f45835ea67c526dc3d37133abc7da67c76661..3ec5c73c5818ce7268cbf2f66606c09599c7dcf9 100644 (file)
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.cpp
+// Name:        src/os2/statbmp.cpp

 // Purpose:     wxStaticBitmap
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxStaticBitmap
 // Author:      David Webster
 // Modified by:


@@ -12,15 +12,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcclient.h"
-#include "wx/window.h"
-#include "wx/os2/private.h"
+#include "wx/statbmp.h"

 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"

-    #include "wx/statbmp.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

+#include "wx/dcclient.h"
+#include "wx/os2/private.h"
+

 #include <stdio.h>
 
 // ---------------------------------------------------------------------------
 #include <stdio.h>
 
 // ---------------------------------------------------------------------------


@@ -119,7 +120,7 @@ bool wxStaticBitmap::Create( wxWindow*         pParent,
         sError = wxPMErrorToStr(vError);
         return false;
     }
         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,
     m_pImage = ConvertImage(rBitmap);
     ::WinSendMsg(   m_hWnd,
                     SM_SETHANDLE,


@@ -154,12 +155,10 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
     return wxWindow::DoGetBestSize();
 }
 

-void wxStaticBitmap::OnPaint (
-  wxPaintEvent&                     WXUNUSED(rEvent)
-)
+void wxStaticBitmap::OnPaint ( wxPaintEvent& WXUNUSED(rEvent) )

 {
 {

-    wxPaintDC                       vDc(this);
-    wxBitmap*                       pBitmap;
+    wxPaintDC vDc(this);
+    wxBitmap* pBitmap;

 
     if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))
     {
 
     if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))
     {


@@ -177,14 +176,12 @@ void wxStaticBitmap::OnPaint (
     }
 } // end of wxStaticBitmap::OnPaint
 
     }
 } // end of wxStaticBitmap::OnPaint
 

-void wxStaticBitmap::SetImage(
-  const wxGDIImage&                 rBitmap
-)
+void wxStaticBitmap::SetImage( const wxGDIImage& rBitmap )

 {
 {

-    int                             nX = 0;
-    int                             nY = 0;
-    int                             nWidth = 0;
-    int                             nHeight = 0;
+    int nX = 0;
+    int nY = 0;
+    int nWidth = 0;
+    int nHeight = 0;

 
     Free();
     ::WinSendMsg( GetHwnd()
 
     Free();
     ::WinSendMsg( GetHwnd()

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index ec2bd57eef8777c8aab1a162133f686afac81189..41f25791f4e0645f33c6adf8367204c9e6292cb6 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -17,9 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)

diff --git a/src/palmos/dcclient.cpp b/src/palmos/dcclient.cpp
index 1269dcb5869320dced94a6480a764f01259e5e4e..b8a423d326b54432c0466e0fff33b6b23f923fc0 100644 (file)
--- a/src/palmos/dcclient.cpp
+++ b/src/palmos/dcclient.cpp
@@ -29,10 +29,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 // ----------------------------------------------------------------------------
 // array/list types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // array/list types
 // ----------------------------------------------------------------------------

diff --git a/src/palmos/joystick.cpp b/src/palmos/joystick.cpp
index f189adc7cd6e773c7b630145302928df0eea0d1d..01a44cd3e3c20f7dc97b6b3f49dc92911d71b625 100644 (file)
--- a/src/palmos/joystick.cpp
+++ b/src/palmos/joystick.cpp
@@ -18,10 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes

diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp
index 6876e0668f0f65df0ddfb9b2fb9bd21776453fac..eb61926a481012b89fdc3753a91a9682f43c5d3b 100644 (file)
--- a/src/palmos/listbox.cpp
+++ b/src/palmos/listbox.cpp
@@ -28,9 +28,9 @@
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/palmos/private.h"
 
 #if wxUSE_OWNER_DRAWN
 #include "wx/palmos/private.h"
 
 #if wxUSE_OWNER_DRAWN

diff --git a/src/palmos/statbmp.cpp b/src/palmos/statbmp.cpp
index 361ba260a723415f676654eb328690553c3d5976..25468400614a96379232382ba877a488d2929145 100644 (file)
--- a/src/palmos/statbmp.cpp
+++ b/src/palmos/statbmp.cpp
@@ -26,14 +26,15 @@
 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 

-#include "wx/window.h"
-#include "wx/palmos/private.h"
+#include "wx/statbmp.h"

 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"

-    #include "wx/statbmp.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

+#include "wx/palmos/private.h"
+

 // ---------------------------------------------------------------------------
 // macors
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // macors
 // ---------------------------------------------------------------------------

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index f87ff65b7fc9b364fc4939444f25432ca2b1642e..b18b7f742d5b2ed8a4de0e59aa949691e86abadf 100644 (file)
--- a/src/palmos/window.cpp
+++ b/src/palmos/window.cpp
@@ -77,7 +77,6 @@
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"

-#include "wx/window.h"

 
 #include <Window.h>
 
 
 #include <Window.h>
 

diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index 6383d601245af599e8b3337a8bb7404bccb450fc..49a4cad688e7349d9cfaf6381fba283e21859f08 100644 (file)
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/event.h"
 
 #ifndef WX_PRECOMP
     #include "wx/event.h"

+    #include "wx/window.h"

 #endif //WX_PRECOMP
 
 #include <linux/joystick.h>
 #endif //WX_PRECOMP
 
 #include <linux/joystick.h>


@@ -28,7 +29,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 

-#include "wx/window.h"

 #include "wx/unix/private.h"
 
 enum {
 #include "wx/unix/private.h"
 
 enum {

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index fe196bc01eac1789830f12a530679f83856e93d3..2d5425934982efd501d5ce9c8392a77be8b3aa3f 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #include "wx/dcmemory.h"
 #endif
 
 #include "wx/dcmemory.h"

-#include "wx/window.h"

 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"

diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index 8b922df00cafdc1cb808ac3aec4a3a46f588dee1..8fb5786a5a82c9773591a0e9a111fcf6d535b83a 100644 (file)
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -17,9 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/frame.h"
 #include "wx/fontutil.h"
 
 #include "wx/frame.h"
 #include "wx/fontutil.h"
 

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 1697027afd9d209a522638e04aabba31300830c7..7b6cdbbecd79e599cc47191f180318c10cafee40 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -23,9 +23,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/gdicmn.h"
 
 #include <X11/Xlib.h>
 #include "wx/gdicmn.h"
 
 #include <X11/Xlib.h>

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index de6b1f8b83c14aa6a2ac295f3f1e16a36b35f0cf..a0a848e097f72eb101ab40162585bc6a1484d859 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -25,9 +25,9 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/app.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/tooltip.h"
 #include "wx/timer.h"
 #include "wx/module.h"
 #include "wx/tooltip.h"
 #include "wx/timer.h"
 #include "wx/module.h"

diff --git a/src/x11/icon.cpp b/src/x11/icon.cpp
index 1d428034e60cc57a0e22f315328a81d2296b1d01..ae063ad5d94528cb1a536fe0b4f0cfb541bdd700 100644 (file)
--- a/src/x11/icon.cpp
+++ b/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
 // 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/icon.h"

-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index e2d9504f4b10407ba8396a8bfb8e83f5aa430f0a..61a885cbddc7dff21901198fdda7ad54fd104ea8 100644 (file)
--- a/src/x11/palette.cpp
+++ b/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"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 604b5f8100ddd6d5f200bea108a3f72adc4e0471..aa03ce8a5b895d0328bead991e3b65783b2a5743 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -28,12 +28,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #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"
 #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>
 
 #include <ctype.h>
 #include <stdarg.h>

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index a7b7beaf44188bcff0ad2e4477ccf38cb67de83b..144e3a4c003278cff74d5a49f1e2221647e2dd34 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -21,9 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/sizer.h"
 #include "wx/panel.h"
 
 #include "wx/sizer.h"
 #include "wx/panel.h"