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

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 63ec84d6023c70a8781cfa13f8989fe2c56b32de..0485809e1b84be2204cce2809a73cfbd24c82de5 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -11,8 +11,9 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/button.h"
     #include "wx/log.h"
 #endif
 

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 64011f46c77c7c2445f691cd9c63b4cc0aef1a3c..5a1693a6a9f12ad33a681168b134f9d9d235b772 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/dlgcmn.cpp
+// Name:        src/common/dlgcmn.cpp
 // Purpose:     common (to all ports) wxDialog functions
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -32,7 +32,6 @@
     #include "wx/settings.h"
     #include "wx/stattext.h"
     #include "wx/sizer.h"
-    #include "wx/button.h"
     #include "wx/containr.h"
 #endif
 

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 1de7b93bdfbc27e2c9e1ac7327e7be9db00b02e3..b74aeec22aa6d8c8756b485929346f086201d90e 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -25,10 +25,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/textctrl.h"

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index fd7f2a25b22b0276cf3144afafe08ef532f01f7c..b7760651303471868a21c852a5956704096ebf73 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -22,7 +22,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
@@ -37,7 +37,6 @@
     #include "wx/textctrl.h"
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
-    #include "wx/button.h"
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 
@@ -49,12 +48,12 @@
 #include "wx/artprov.h"
 
 #ifdef  __WXMSW__
-  // for OutputDebugString()
-  #include  "wx/msw/private.h"
+    // for OutputDebugString()
+    #include  "wx/msw/private.h"
 #endif // Windows
 
 #ifdef  __WXPM__
-  #include <time.h>
+    #include <time.h>
 #endif
 
 #if wxUSE_LOG_DIALOG
@@ -1217,4 +1216,3 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 }
 
 #endif // wxUSE_LOG && wxUSE_TEXTCTRL
-

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 9b9d064259bdcbd96ea60e130a8889c25fbf0644..abadbcc404d78c695ace4a060aa9a9cc8951e291 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/tglbtn.cpp
+// Name:        src/gtk/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter
@@ -13,10 +13,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_TOGGLEBTN
+
 #include "wx/tglbtn.h"
-#include "wx/button.h"
 
-#if wxUSE_TOGGLEBTN
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
 
 // FIXME: Use GtkImage instead of GtkPixmap.
 #include <gtk/gtkversion.h>
@@ -362,4 +365,3 @@ wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_TOGGLEBTN
-

diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp
index d8696cb8a5c678b61120218a0b7a2ec1a1a6e62e..78b4a596c9a61c5de4f75ff1cf993e6ab36468ec 100644 (file)
--- a/src/gtk1/tglbtn.cpp
+++ b/src/gtk1/tglbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk1/tglbtn.cpp
+// Name:        src/gtk1/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter
@@ -13,10 +13,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_TOGGLEBTN
+
 #include "wx/tglbtn.h"
-#include "wx/button.h"
 
-#if wxUSE_TOGGLEBTN
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
 
 #include "wx/gtk1/private.h"
 
@@ -358,4 +361,3 @@ wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_TOGGLEBTN
-

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index d293624354db6a81bc3aee8f00d894d324f7138b..252737418492981e1b2d84484d0229767861c572 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -20,9 +20,9 @@
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/dc.h"
+    #include "wx/button.h"
 #endif
 
-#include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 35a45211688f723ccf12d1c46b4e304268b6c57b..54d864df0e2db0629e78e99a3bd37828ca09c969 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -14,7 +14,11 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
-#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
 #include "wx/menu.h"
 #include "wx/containr.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index f5ba7c6f314e594e689913e0e4bf895c98d81319..b5d1bffd6785491911a628dfdf5fa24451a1cceb 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -12,7 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/combobox.h"
-#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 417c018cdaea6baaa86eafe1f201fd88dd8788da..5fa7444139e08f6020232f85f6e8b47e8231285f 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -18,6 +18,7 @@
     #include "wx/panel.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/button.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
@@ -25,7 +26,6 @@
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
 #include "wx/scrolbar.h"
-#include "wx/button.h"
 #include "wx/dialog.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 1b54683f4e94ead31bbc1e81aed809956a705914..6076e3400a972f58566a089ccc9f8df0203e8a16 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -20,9 +20,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/button.h"
 #endif
 
-#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 276ee3a62a1ea2a1c7450a2a0fddd880c68a7618..687f527adbee6a986b98d5b9cc259e25e4253936 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -20,6 +20,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
+    #include "wx/button.h"
 #endif
 
 #ifdef __DARWIN__
@@ -39,7 +40,6 @@
     #endif
 #endif
 
-#include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 736d80406d210c74da7cb6060f1b8d06467a00c0..d6fe9edd1e2e6ca39ed664deb3ef6e3ff54fe96a 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -21,6 +21,7 @@
     #include "wx/frame.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/menu.h"
@@ -28,7 +29,6 @@
 #include "wx/dialog.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
-#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/tooltip.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 6d7e25c1ce693ef84f60593360ca80cdc0293880..4fe7e37496ea775f02510d6d109959f1974b0975 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -24,9 +24,9 @@
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/dc.h"
+    #include "wx/button.h"
 #endif
 
-#include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
@@ -346,7 +346,7 @@ MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
             // VZ: we could find the menu from its handle here by examining all
             //     the menus in the menu bar recursively but knowing that neither
             //     wxMSW nor wxGTK do it why bother...
- #if 0
+#if 0
             MenuRef menuRef;
 
             GetEventParameter(event,
@@ -354,7 +354,7 @@ MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
                               typeMenuRef, NULL,
                               sizeof(menuRef), NULL,
                               &menuRef);
- #endif // 0
+#endif // 0
 
             wxEventType type=0;
             MenuCommand cmd=0;

diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp
index d81d07e32b7d9eb33a8d7e65a6e026107c6c4da5..5af51c8fa867206136b036d6fa682537c5cfe3ae 100644 (file)
--- a/src/mac/classic/combobox.cpp
+++ b/src/mac/classic/combobox.cpp
@@ -9,8 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/combobox.h"
-#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 9e8e3660f6c236a76a81aa2d0513056cad702df0..1599c395c5bb5c110b98e5d71b0a3e03855a79b7 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -22,6 +22,7 @@
     #include "wx/panel.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/button.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
@@ -29,7 +30,6 @@
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
 #include "wx/scrolbar.h"
-#include "wx/button.h"
 #include "wx/dialog.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 303848e70caa620fd5fc4bc1206ebc81b727223a..bf6bbdf7ccf9a241f3a5f07130a2b34ddaf2f718 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -20,9 +20,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/button.h"
 #endif
 
-#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index e12535f5d889e214104e2755457a278c966e035d..5c028e05f26ce02434ab5f49095354b186f1d260 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -23,6 +23,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
+    #include "wx/button.h"
 #endif
 
 #ifdef __DARWIN__
@@ -42,7 +43,6 @@
     #endif
 #endif
 
-#include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 12059e5f2d385be46dae7dea685c26b4bcb9437b..6d8165101a710be57d7bcb8a6ceeeaa9ca9a0d13 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -21,6 +21,7 @@
     #include "wx/frame.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/menu.h"
@@ -29,7 +30,6 @@
 #include "wx/listbox.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
-#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/notebook.h"

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index f3b68b1d3f5c8e2c34fd5d9a76be1e5c7d8bf378..c82cadf8bfeab922acfcfc6e13f9efc578554e0d 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -34,11 +34,11 @@
     #include "wx/frame.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/layout.h"
-#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/scrolwin.h"
 #include "wx/module.h"

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 6b6f67aa651b4d7350a33a91949ee7df7ba7cafa..ad0fbede215350c8bc4e9ec09b0ce99d43c72379 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/button.cpp
+// Name:        src/msw/button.cpp
 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:
@@ -26,9 +26,10 @@
 
 #if wxUSE_BUTTON
 
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/button.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"
@@ -132,16 +133,16 @@ bool wxButton::Create(wxWindow *parent,
     {
         // On Windows, some buttons aren't supposed to have
         // mnemonics, so strip them out.
-        
-        label = wxGetStockLabel(id 
+
+        label = wxGetStockLabel(id
 #if defined(__WXMSW__) || defined(__WXWINCE__)
                                         , ( id != wxID_OK &&
                                             id != wxID_CANCEL &&
                                             id != wxID_CLOSE )
 #endif
                                 );
-     }
-    
+    }
+
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
@@ -729,4 +730,3 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
 #endif // __WIN32__
 
 #endif // wxUSE_BUTTON
-

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index d9c7fd124549d8f3b4281f420d66e8dc3ed17ef5..e3e986fe8c0ef32437136d1ed5cb32ba6fb37a82 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -2,8 +2,8 @@
 // Name:        src/msw/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.
-// Author: John Norris, minor changes by Axel Schlueter
-// and William Gallafent.
+// Author:      John Norris, minor changes by Axel Schlueter
+//              and William Gallafent.
 // Modified by:
 // Created:     08.02.01
 // RCS-ID:      $Id$
@@ -25,10 +25,10 @@
     #pragma hdrstop
 #endif
 
-#include "wx/tglbtn.h"
-
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
@@ -164,4 +164,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
-

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index 3e831bcf91fb8eb03c2786b3518e76dae9037901..2e9a10d57821fe280818521f3d5b154b1cc321e1 100644 (file)
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.cpp
+// Name:        src/os2/button.cpp
 // Purpose:     wxButton
 // Author:      David Webster
 // Modified by:
@@ -12,9 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/button.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"
@@ -89,7 +90,7 @@ bool wxButton::Create( wxWindow*          pParent,
                                       );
     if (m_hWnd == 0)
     {
-        return FALSE;
+        return false;
     }
 
     //

diff --git a/src/os2/tglbtn.cpp b/src/os2/tglbtn.cpp
index ef7907c38a521b21958ebba48ae158c613015868..6269009481bab25b6fa399f39ce8b318684c6fc1 100644 (file)
--- a/src/os2/tglbtn.cpp
+++ b/src/os2/tglbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/tglbtn.cpp
+// Name:        src/os2/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.
 // Author: John Norris, minor changes by Axel Schlueter
@@ -25,10 +25,10 @@
     #pragma hdrstop
 #endif
 
-#include "wx/tglbtn.h"
-
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
@@ -152,4 +152,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
-

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index b2b7b6ef309450100a229af648f333c1baad114b..2e036b19aab8fb7b246e0973f974f6b535849d8c 100644 (file)
--- a/src/palmos/button.cpp
+++ b/src/palmos/button.cpp
@@ -26,9 +26,10 @@
 
 #if wxUSE_BUTTON
 
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/button.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"
@@ -234,4 +235,3 @@ void wxButton::Command(wxCommandEvent &event)
 }
 
 #endif // wxUSE_BUTTON
-

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index 4cda57075f4fb553bf2a1ae2cff244802bc9c509..fea796246a74c2045c11216d91e3a2b21f6fe800 100644 (file)
--- a/src/palmos/control.cpp
+++ b/src/palmos/control.cpp
@@ -32,11 +32,11 @@
     #include "wx/dcclient.h"
     #include "wx/log.h"
     #include "wx/settings.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/control.h"
 #include "wx/toplevel.h"
-#include "wx/button.h"
 #include "wx/checkbox.h"
 #include "wx/tglbtn.h"
 #include "wx/radiobut.h"
@@ -390,7 +390,7 @@ void wxControl::SetFieldLabel(const wxString& label)
     if(field==NULL)
         return;
 
-    uint16_t newSize = label.Length() + 1;
+    uint16_t newSize = label.length() + 1;
     MemHandle strHandle = FldGetTextHandle(field);
     FldSetTextHandle(field, NULL );
     if (strHandle)

diff --git a/src/palmos/tglbtn.cpp b/src/palmos/tglbtn.cpp
index d9de36c03ffc1f37a4ce97356373a5ffaef6feaf..3f75361d7e45b16d4c3b33cae4b2d12c7826ecf9 100644 (file)
--- a/src/palmos/tglbtn.cpp
+++ b/src/palmos/tglbtn.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
@@ -35,8 +37,6 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
-#include "wx/tglbtn.h"
-
 #include <Control.h>
 
 // ----------------------------------------------------------------------------
@@ -101,4 +101,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
-

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 2e0f479cbcaad2c2bad0d7e23208114e0008ceb5..8be56e16f57048f8080cd3281f3b5e76bc42c9b8 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -33,13 +33,13 @@
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/containr.h"        // wxSetFocusToChild()
+    #include "wx/button.h"
 #endif //WX_PRECOMP
 
 #include "wx/module.h"
 #include "wx/display.h"
 
 // controls for sending select event
-#include "wx/button.h"
 #include "wx/checkbox.h"
 #include "wx/radiobut.h"
 #include "wx/tglbtn.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index a027babec61f78e578bbcf1e9f7f327a75a75779..c185b0e9e0b3dda91ca036f1a21c41d5114d27a2 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -35,13 +35,13 @@
     #include "wx/frame.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/listbox.h"
-#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/scrolwin.h"

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index ed74f1d3a1ba0a3ac4cdc10e17309a38945eea52..397c6dbe472903c446312d4b3fed148e12e16896 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bttn.cpp
+// Name:        src/xrc/xh_bttn.cpp
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
@@ -18,7 +18,10 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_bttn.h"
-#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)