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

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

src/aui/framemanager.cpp

@@ -34,12 +34,12 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcscreen.h"
+    #include "wx/toolbar.h"
 #endif
 
 //#include "wx/dcbuffer.h"
 
 #include "wx/image.h"
-#include "wx/toolbar.h"
 
 #if wxUSE_MDI
      #include "wx/mdi.h"

src/cocoa/toolbar.mm

@@ -21,8 +21,10 @@
 #include "wx/wxprec.h"
 
 #if wxUSE_TOOLBAR_NATIVE
+
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/toolbar.h"
     #include "wx/frame.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP

src/common/framecmn.cpp

@@ -29,11 +29,9 @@
     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif

src/gtk/frame.cpp

@@ -26,11 +26,9 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/control.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif

src/gtk/tbargtk.cpp

@@ -19,10 +19,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/toolbar.h"
-
 #if wxUSE_TOOLBAR_NATIVE
 
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 #endif

src/gtk/window.cpp

@@ -28,16 +28,13 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/module.h"
 #include "wx/combobox.h"
 
-#if wxUSE_TOOLBAR_NATIVE
-    #include "wx/toolbar.h"
-#endif
-
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif

src/gtk1/frame.cpp

@@ -26,11 +26,9 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/control.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif

src/gtk1/tbargtk.cpp

@@ -19,10 +19,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/toolbar.h"
-
 #if wxUSE_TOOLBAR_NATIVE
 
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 #endif

src/html/helpfrm.cpp

@@ -37,6 +37,7 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
 #endif // WXPRECOMP
 
 #include "wx/html/helpfrm.h"
@@ -49,7 +50,6 @@
 #include "wx/html/htmlwin.h"
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
-#include "wx/toolbar.h"
 #include "wx/fontenum.h"
 #include "wx/filedlg.h"
 #include "wx/artprov.h"

src/html/helpwnd.cpp

@@ -37,6 +37,7 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
 #endif // WXPRECOMP
 
 #include "wx/html/helpfrm.h"
@@ -50,7 +51,6 @@
 #include "wx/html/htmlwin.h"
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
-#include "wx/toolbar.h"
 #include "wx/fontenum.h"
 #include "wx/filedlg.h"
 #include "wx/artprov.h"

src/mac/carbon/frame.cpp

@@ -19,10 +19,10 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
 #include "wx/statusbr.h"
-#include "wx/toolbar.h"
 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"

src/mac/carbon/toolbar.cpp

@@ -13,10 +13,14 @@
 
 #if wxUSE_TOOLBAR
 
-#include "wx/wx.h"
-#include "wx/bitmap.h"
 #include "wx/toolbar.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/bitmap.h"
+
 #include "wx/mac/uma.h"
 #include "wx/geometry.h"
 

src/mac/carbon/window.cpp

@@ -29,6 +29,7 @@
     #include "wx/scrolbar.h"
     #include "wx/statbox.h"
     #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/layout.h"
@@ -38,8 +39,6 @@
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 
-#include "wx/toolbar.h"
-
 #if wxUSE_CARET
     #include "wx/caret.h"
 #endif

src/mac/classic/frame.cpp

@@ -19,10 +19,10 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
 #include "wx/statusbr.h"
-#include "wx/toolbar.h"
 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"

src/mac/classic/toolbar.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        toolbar.cpp
+// Name:        src/mac/classic/toolbar.cpp
 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,11 +9,16 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/wx.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/bitmap.h"
@@ -265,7 +270,7 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
-    if (id == -1)
+    if (id == wxID_ANY)
         m_windowId = NewControlId();
     else
         m_windowId = id;
@@ -280,7 +285,7 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
         m_y = y ;
     }
 
-    return TRUE;
+    return true;
 }
 
 wxToolBar::~wxToolBar()
@@ -292,7 +297,7 @@ wxToolBar::~wxToolBar()
 bool wxToolBar::Realize()
 {
     if (m_tools.GetCount() == 0)
-        return FALSE;
+        return false;
 
     int x = m_xMargin + kwxMacToolBarLeftMargin ;
     int y = m_yMargin + kwxMacToolBarTopMargin ;
@@ -373,7 +378,7 @@ bool wxToolBar::Realize()
     SetSize(maxWidth, maxHeight);
     InvalidateBestSize();
 
-    return TRUE;
+    return true;
 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
@@ -491,7 +496,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
     tool->Attach(this);
     InvalidateBestSize();
 
-    return TRUE;
+    return true;
 }
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
@@ -537,7 +542,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
     }
 
     InvalidateBestSize();
-    return TRUE ;
+    return true ;
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
@@ -614,4 +619,3 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
 }
 
 #endif // wxUSE_TOOLBAR
-

src/motif/frame.cpp

@@ -35,10 +35,10 @@
     #include "wx/menu.h"
     #include "wx/icon.h"
     #include "wx/settings.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/statusbr.h"
-#include "wx/toolbar.h"
 
 #ifdef __VMS__
     #pragma message disable nosimpint

src/msw/dialog.cpp

@@ -34,6 +34,7 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -46,10 +47,6 @@
     #include "wx/msw/wince/resources.h"
 #endif // __SMARTPHONE__ && __WXWINCE__
 
-#if wxUSE_TOOLBAR && defined(__POCKETPC__)
-#include "wx/toolbar.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

src/msw/frame.cpp

@@ -36,6 +36,7 @@
     #include "wx/mdi.h"
     #include "wx/panel.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -54,10 +55,6 @@
     #include "wx/generic/statusbr.h"
 #endif // wxUSE_STATUSBAR
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include "wx/menuitem.h"
 
 #ifdef __WXUNIVERSAL__

src/msw/mdi.cpp

@@ -38,6 +38,7 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/stockitem.h"
@@ -48,10 +49,6 @@
     #include "wx/msw/statbr95.h"
 #endif
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include <string.h>
 
 // ---------------------------------------------------------------------------

src/msw/tbar95.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
 
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/frame.h"
@@ -38,7 +40,6 @@
     #include "wx/app.h"         // for GetComCtl32Version
 #endif
 
-#include "wx/toolbar.h"
 #include "wx/sysopt.h"
 #include "wx/image.h"
 

src/msw/wince/tbarwce.cpp

@@ -28,6 +28,8 @@
 // with a WinCE earlier than 4, or we wish to emulate a PocketPC-style UI
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
 
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/frame.h"
@@ -39,8 +41,6 @@
     #include "wx/control.h"
 #endif
 
-#include "wx/toolbar.h"
-
 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
     #include "malloc.h"
 #endif

src/os2/frame.cpp

@@ -29,6 +29,7 @@
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
@@ -38,10 +39,6 @@
     #include "wx/generic/statusbr.h"
 #endif // wxUSE_STATUSBAR
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include "wx/menuitem.h"
 
 // ----------------------------------------------------------------------------

src/os2/toolbar.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        toolbar.cpp
+// Name:        src/os2/toolbar.cpp
 // Purpose:     wxToolBar
 // Author:      David Webster
 // Modified by:
@@ -14,6 +14,8 @@
 
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
 
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/window.h"
@@ -24,9 +26,8 @@
 #endif
 
 #include "wx/tooltip.h"
-#include "wx/toolbar.h"
 
-bool                                wxToolBar::m_bInitialized = FALSE;
+bool wxToolBar::m_bInitialized = false;
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -275,10 +276,8 @@ wxToolBarToolBase* wxToolBar::InsertTool(
     return pTool;
 } // end of wxToolBar::InsertTool
 
-bool wxToolBar::DoInsertTool(
+bool wxToolBar::DoInsertTool( size_t WXUNUSED(nPos),
-  size_t                            WXUNUSED(nPos)
+                              wxToolBarToolBase* pToolBase )
-, wxToolBarToolBase*                pToolBase
-)
 {
     wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
 
@@ -303,27 +302,23 @@ bool wxToolBar::DoInsertTool(
         if ((pTool->m_vY + pTool->GetNormalBitmap().GetHeight() + m_yMargin) > m_vMaxHeight)
             m_vMaxHeight = (wxCoord)((pTool->m_vY + pTool->GetHeight() + m_yMargin));
     }
-    return TRUE;
+    return true;
 } // end of wxToolBar::DoInsertTool
 
-bool wxToolBar::DoDeleteTool(
+bool wxToolBar::DoDeleteTool( size_t WXUNUSED(nPos),
-  size_t                            WXUNUSED(nPos)
+                              wxToolBarToolBase* pTool )
-, wxToolBarToolBase*                pTool
-)
 {
     pTool->Detach();
     Refresh();
-    return TRUE;
+    return true;
 } // end of wxToolBar::DoDeleteTool
 
-bool wxToolBar::Create(
+bool wxToolBar::Create( wxWindow* pParent,
-  wxWindow*                         pParent
+                        wxWindowID vId,
-, wxWindowID                        vId
+                        const wxPoint& rPos,
-, const wxPoint&                    rPos
+                        const wxSize& rSize,
-, const wxSize&                     rSize
+                        long lStyle,
-, long                              lStyle
+                        const wxString& rsName )
-, const wxString&                   rsName
-)
 {
     if ( !wxWindow::Create( pParent
                            ,vId
@@ -332,7 +327,7 @@ bool wxToolBar::Create(
                            ,lStyle
                            ,rsName
                           ))
-        return FALSE;
+        return false;
 
     // Set it to grey (or other 3D face colour)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
@@ -418,7 +413,7 @@ bool wxToolBar::Create(
             ,nWidth
             ,nHeight
            );
-    return TRUE;
+    return true;
 } // end of wxToolBar::Create
 
 wxToolBar::~wxToolBar()
@@ -577,8 +572,8 @@ bool wxToolBar::Realize()
 
     m_maxWidth += m_xMargin;
     m_maxHeight += m_yMargin;
-    m_bInitialized = TRUE;
+    m_bInitialized = true;
-    return TRUE;
+    return true;
 } // end of wxToolBar::Realize
 
 // ----------------------------------------------------------------------------
@@ -716,9 +711,7 @@ void wxToolBar::OnMouseEvent(
             pTool = (wxToolBarTool *)FindById(m_nCurrentTool);
             if (pTool && !pTool->IsToggled())
             {
-                RaiseTool( pTool
+                RaiseTool( pTool, FALSE );
-                          ,FALSE
-                         );
             }
             m_nCurrentTool = -1;
             OnMouseEnter(-1);
@@ -745,9 +738,7 @@ void wxToolBar::OnMouseEvent(
             wxToolBarTool*          pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool);
 
             if (pOldTool && !pTool->IsToggled())
-                RaiseTool( pOldTool
+                RaiseTool( pOldTool, FALSE );
-                          ,FALSE
-                         );
             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);
             if (!pTool->GetShortHelp().empty())
@@ -810,27 +801,20 @@ void wxToolBar::OnMouseEvent(
 // drawing
 // ----------------------------------------------------------------------------
 
-void wxToolBar::DrawTool(
+void wxToolBar::DrawTool( wxToolBarToolBase* pTool )
-  wxToolBarToolBase*                pTool
-)
 {
     wxClientDC vDc(this);
 
-    DrawTool( vDc
+    DrawTool( vDc, pTool );
-             ,pTool
-            );
 } // end of wxToolBar::DrawTool
 
-void wxToolBar::DrawTool(
+void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
-  wxDC&                             rDc
-, wxToolBarToolBase*                pToolBase
-)
 {
     wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
     wxColour gray85( 85,85,85 );
     wxPen vDarkGreyPen( gray85, 1, wxSOLID );
     wxBitmap vBitmap = pTool->GetNormalBitmap();
-    bool bUseMask = FALSE;
+    bool bUseMask = false;
     wxMask* pMask = NULL;
 
     PrepareDC(rDc);
@@ -839,7 +823,7 @@ void wxToolBar::DrawTool(
         return;
     if ((pMask = vBitmap.GetMask()) != NULL)
         if (pMask->GetMaskBitmap() != NULLHANDLE)
-            bUseMask = TRUE;
+            bUseMask = true;
 
     if (!pTool->IsToggled())
     {
@@ -1179,15 +1163,11 @@ void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
     }
 } // end of wxToolBar::RaiseTool
 
-void wxToolBar::OnTimer (
+void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
-  wxTimerEvent&                     rEvent
-)
 {
     if (rEvent.GetId() == m_vToolTimer.GetTimerId())
     {
-        wxPoint                     vPos( m_vXMouse
+        wxPoint vPos( m_vXMouse, m_vYMouse );
-                                         ,m_vYMouse
-                                        );
 
         m_pToolTip->DisplayToolTipWindow(vPos);
         m_vToolTimer.Stop();

src/palmos/frame.cpp

@@ -36,6 +36,7 @@
     #include "wx/mdi.h"
     #include "wx/panel.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
 #if wxUSE_STATUSBAR
@@ -43,10 +44,6 @@
     #include "wx/generic/statusbr.h"
 #endif // wxUSE_STATUSBAR
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include "wx/menuitem.h"
 
 #ifdef __WXUNIVERSAL__

src/palmos/mdi.cpp

@@ -38,6 +38,7 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/mdi.h"
@@ -47,10 +48,6 @@
     #include "wx/palmos/statbr95.h"
 #endif
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include <string.h>
 
 // ---------------------------------------------------------------------------

src/xrc/xh_toolb.cpp

@@ -21,10 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
+    #include "wx/toolbar.h"
 #endif
 
-#include "wx/toolbar.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
 
 wxToolBarXmlHandler::wxToolBarXmlHandler()