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

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

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
 

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
 

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"

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
-

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,11 +13,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/tglbtn.h"
-#include "wx/button.h"
-
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
 // FIXME: Use GtkImage instead of GtkPixmap.
 #include <gtk/gtkversion.h>
 #ifdef GTK_DISABLE_DEPRECATED
@@ -362,4 +365,3 @@ wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_TOGGLEBTN
-

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,11 +13,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/tglbtn.h"
-#include "wx/button.h"
-
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
 #include "wx/gtk1/private.h"
 
 extern void wxapp_install_idle_handler();
@@ -358,4 +361,3 @@ wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_TOGGLEBTN
-

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"

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"

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

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"

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"
 

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"

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"

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;

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"
 

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"

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"
 

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"

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"

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"

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
-

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
-

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

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
-

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
-

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)

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
-

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"

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"

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)