From 4e3e485bc855bb6aa3e3e7978eac9fb5eea0287e Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 7 Jun 2006 17:46:13 +0000 Subject: [PATCH] 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 | 2 +- src/cocoa/toolbar.mm | 6 +- src/common/framecmn.cpp | 4 +- src/gtk/frame.cpp | 4 +- src/gtk/tbargtk.cpp | 4 +- src/gtk/window.cpp | 5 +- src/gtk1/frame.cpp | 4 +- src/gtk1/tbargtk.cpp | 4 +- src/html/helpfrm.cpp | 2 +- src/html/helpwnd.cpp | 2 +- src/mac/carbon/frame.cpp | 2 +- src/mac/carbon/toolbar.cpp | 8 +- src/mac/carbon/window.cpp | 3 +- src/mac/classic/frame.cpp | 2 +- src/mac/classic/toolbar.cpp | 164 ++++++++++++++++++------------------ src/motif/frame.cpp | 2 +- src/msw/dialog.cpp | 5 +- src/msw/frame.cpp | 5 +- src/msw/mdi.cpp | 5 +- src/msw/tbar95.cpp | 3 +- src/msw/wince/tbarwce.cpp | 4 +- src/os2/frame.cpp | 5 +- src/os2/toolbar.cpp | 82 +++++++----------- src/palmos/frame.cpp | 5 +- src/palmos/mdi.cpp | 5 +- src/xrc/xh_toolb.cpp | 3 +- 26 files changed, 151 insertions(+), 189 deletions(-) diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 55303c23d3..20268d2c76 100644 --- a/src/aui/framemanager.cpp +++ b/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" diff --git a/src/cocoa/toolbar.mm b/src/cocoa/toolbar.mm index bf0d2a4d5a..b831696cfe 100644 --- a/src/cocoa/toolbar.mm +++ b/src/cocoa/toolbar.mm @@ -6,7 +6,7 @@ // Created: 2003/08/17 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -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 diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 31a955fede..8532a74929 100644 --- a/src/common/framecmn.cpp +++ b/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 diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 34e6b9de37..f13c3957bc 100644 --- a/src/gtk/frame.cpp +++ b/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 diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index c36d3ef85f..62aa329954 100644 --- a/src/gtk/tbargtk.cpp +++ b/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 diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index bd771d2dee..bc774aeddc 100644 --- a/src/gtk/window.cpp +++ b/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 diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 84ff302701..b9818eba52 100644 --- a/src/gtk1/frame.cpp +++ b/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 diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 71392ae7e5..06885d5341 100644 --- a/src/gtk1/tbargtk.cpp +++ b/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 diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 3e8da6b12c..35c4a46260 100644 --- a/src/html/helpfrm.cpp +++ b/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" diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 75ebdcb6f9..7c39fd3d63 100644 --- a/src/html/helpwnd.cpp +++ b/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" diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 00e588c945..7469315094 100644 --- a/src/mac/carbon/frame.cpp +++ b/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" diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 5c7934010e..9b1ef2d3c9 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/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" diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index bd242fe8f0..253dbf49a8 100644 --- a/src/mac/carbon/window.cpp +++ b/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 diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp index d97a3909e5..0cc1fec03e 100644 --- a/src/mac/classic/frame.cpp +++ b/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" diff --git a/src/mac/classic/toolbar.cpp b/src/mac/classic/toolbar.cpp index 16f8575392..e45400efe0 100644 --- a/src/mac/classic/toolbar.cpp +++ b/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" @@ -21,8 +26,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) - EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) - EVT_PAINT( wxToolBar::OnPaint ) + EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) + EVT_PAINT( wxToolBar::OnPaint ) END_EVENT_TABLE() #include "wx/mac/uma.h" @@ -43,19 +48,19 @@ public: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp) ; - + wxToolBarTool(wxToolBar *tbar, wxControl *control) : wxToolBarToolBase(tbar, control) { Init() ; } - + ~wxToolBarTool() { if ( m_controlHandle ) DisposeControl( m_controlHandle ) ; } - + ControlHandle GetControlHandle() { return m_controlHandle ; } void SetControlHandle( ControlHandle handle ) { m_controlHandle = handle ; } @@ -82,9 +87,9 @@ public: wxPoint GetPosition() const { return wxPoint(m_x, m_y); - } + } private : - void Init() + void Init() { m_controlHandle = NULL ; } @@ -119,18 +124,18 @@ void wxToolBarTool::SetPosition(const wxPoint& position) { int x , y ; x = y = 0 ; - WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetRootWindow() ; + WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetRootWindow() ; GetToolBar()->MacWindowToRootWindow( &x , &y ) ; int mac_x = x + position.x ; int mac_y = y + position.y ; - - Rect contrlRect ; - GetControlBounds( m_controlHandle , &contrlRect ) ; + + Rect contrlRect ; + GetControlBounds( m_controlHandle , &contrlRect ) ; int former_mac_x = contrlRect.left ; int former_mac_y = contrlRect.top ; wxSize sz = GetToolBar()->GetToolSize() ; - + if ( mac_x != former_mac_x || mac_y != former_mac_y ) { { @@ -156,42 +161,42 @@ const short kwxMacToolBarTopMargin = 2 ; const short kwxMacToolBarLeftMargin = 2 ; wxToolBarTool::wxToolBarTool(wxToolBar *tbar, - int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) + int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp) : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind, clientData, shortHelp, longHelp) { Init(); - + if (id == wxID_SEPARATOR) return; - - WindowRef window = (WindowRef) tbar->MacGetRootWindow() ; - wxSize toolSize = tbar->GetToolSize() ; + + WindowRef window = (WindowRef) tbar->MacGetRootWindow() ; + wxSize toolSize = tbar->GetToolSize() ; Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ; - + ControlButtonContentInfo info ; wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ; - + SInt16 behaviour = kControlBehaviorOffsetContents ; if ( CanBeToggled() ) behaviour += kControlBehaviorToggles ; - - if ( info.contentType != kControlNoContent ) + + if ( info.contentType != kControlNoContent ) { - m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , + m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; - + ::SetControlData( m_controlHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; } else { - m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , + m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; } UMAShowControl( m_controlHandle ) ; @@ -207,7 +212,7 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar, { ::SetControl32BitValue( m_controlHandle , 0 ) ; } - + ControlHandle container = (ControlHandle) tbar->MacGetContainerForEmbedding() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; ::EmbedControl( m_controlHandle , container ) ; @@ -242,12 +247,12 @@ void wxToolBar::Init() bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) -{ +{ int x = pos.x; int y = pos.y; int width = size.x; int height = size.y; - + if (width <= 0) width = 100; if (height <= 0) @@ -256,20 +261,20 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons x = 0; if (y < 0) y = 0; - + SetName(name); - + m_windowStyle = style; parent->AddChild(this); - + m_backgroundColour = parent->GetBackgroundColour() ; m_foregroundColour = parent->GetForegroundColour() ; - - if (id == -1) + + if (id == wxID_ANY) m_windowId = NewControlId(); else m_windowId = id; - + { m_width = size.x ; m_height = size.y ; @@ -279,12 +284,12 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons m_x = x ; m_y = y ; } - - return TRUE; + + return true; } wxToolBar::~wxToolBar() -{ +{ // we must refresh the frame size when the toolbar is deleted but the frame // is not - otherwise toolbar leaves a hole in the place it used to occupy } @@ -292,17 +297,17 @@ wxToolBar::~wxToolBar() bool wxToolBar::Realize() { if (m_tools.GetCount() == 0) - return FALSE; + return false; int x = m_xMargin + kwxMacToolBarLeftMargin ; int y = m_yMargin + kwxMacToolBarTopMargin ; int tw, th; GetSize(& tw, & th); - + int maxWidth = 0 ; int maxHeight = 0 ; - + int maxToolWidth = 0; int maxToolHeight = 0; @@ -326,15 +331,15 @@ bool wxToolBar::Realize() { wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); wxSize cursize = tool->GetSize() ; - + // for the moment we just do a single row/column alignement if ( x + cursize.x > maxWidth ) maxWidth = x + cursize.x ; if ( y + cursize.y > maxHeight ) maxHeight = y + cursize.y ; - + tool->SetPosition( wxPoint( x , y ) ) ; - + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) { y += cursize.y ; @@ -346,7 +351,7 @@ bool wxToolBar::Realize() node = node->GetNext(); } - + if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) { if ( m_maxRows == 0 ) @@ -354,7 +359,7 @@ bool wxToolBar::Realize() // if not set yet, only one row SetRows(1); } - maxWidth = tw ; + maxWidth = tw ; maxHeight += m_yMargin + kwxMacToolBarTopMargin; m_maxHeight = maxHeight ; } @@ -369,11 +374,11 @@ bool wxToolBar::Realize() maxWidth += m_xMargin + kwxMacToolBarLeftMargin; m_maxWidth = maxWidth ; } - + SetSize(maxWidth, maxHeight); InvalidateBestSize(); - - return TRUE; + + return true; } void wxToolBar::SetToolBitmapSize(const wxSize& size) @@ -387,15 +392,15 @@ wxSize wxToolBar::GetToolSize() const return wxSize(m_defaultWidth + 4, m_defaultHeight + 4); } -void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) { wxToolBarToolsList::Node *node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; + wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; if ( tool->IsButton() ) { - if( (WXWidget) tool->GetControlHandle() == control ) + if( (WXWidget) tool->GetControlHandle() == control ) { if ( tool->CanBeToggled() ) { @@ -419,7 +424,7 @@ void wxToolBar::SetRows(int nRows) m_maxRows = nRows; } -void wxToolBar::MacSuperChangedPosition() +void wxToolBar::MacSuperChangedPosition() { wxWindow::MacSuperChangedPosition() ; Realize() ; @@ -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)) @@ -519,7 +524,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) tool->Detach(); // and finally reposition all the controls after this one - + for ( /* node -> first after deleted */ ; node; node = node->GetNext() ) { wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData(); @@ -535,24 +540,24 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) } tool2->SetPosition( pt ) ; } - + InvalidateBestSize(); - return TRUE ; + return true ; } void wxToolBar::OnPaint(wxPaintEvent& event) { wxPaintDC dc(this) ; wxMacPortSetter helper(&dc) ; - - Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + + Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ; UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; { wxToolBarToolsList::Node *node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; + wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; if ( tool->IsButton() ) { UMADrawControl( tool->GetControlHandle() ) ; @@ -561,41 +566,41 @@ void wxToolBar::OnPaint(wxPaintEvent& event) } } -void wxToolBar::OnMouse( wxMouseEvent &event ) +void wxToolBar::OnMouse( wxMouseEvent &event ) { if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) { - + int x = event.m_x ; int y = event.m_y ; - + MacClientToRootWindow( &x , &y ) ; - + ControlHandle control ; Point localwhere ; SInt16 controlpart ; WindowRef window = (WindowRef) MacGetRootWindow() ; - + localwhere.h = x ; localwhere.v = y ; - + short modifiers = 0; - + if ( !event.m_leftDown && !event.m_rightDown ) modifiers |= btnState ; - + if ( event.m_shiftDown ) modifiers |= shiftKey ; - + if ( event.m_controlDown ) modifiers |= controlKey ; - + if ( event.m_altDown ) modifiers |= optionKey ; - + if ( event.m_metaDown ) modifiers |= cmdKey ; - + controlpart = ::FindControl( localwhere , window , &control ) ; { if ( control && ::IsControlActive( control ) ) @@ -614,4 +619,3 @@ void wxToolBar::OnMouse( wxMouseEvent &event ) } #endif // wxUSE_TOOLBAR - diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 6029bd7a32..35d67b0619 100644 --- a/src/motif/frame.cpp +++ b/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 diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index e36a8017d7..ed5230d7d1 100644 --- a/src/msw/dialog.cpp +++ b/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 // ---------------------------------------------------------------------------- diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index f438b28bb7..55edcb689f 100644 --- a/src/msw/frame.cpp +++ b/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__ diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 5b7dd5e75e..9d39671a99 100644 --- a/src/msw/mdi.cpp +++ b/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 // --------------------------------------------------------------------------- diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 1068ff35ed..f28404d38b 100644 --- a/src/msw/tbar95.cpp +++ b/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" diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 173dbd249e..f80b550c3a 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/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 diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index c909d19d16..2d31220114 100644 --- a/src/os2/frame.cpp +++ b/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" // ---------------------------------------------------------------------------- diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp index ea8d5f8480..eb6283de0a 100644 --- a/src/os2/toolbar.cpp +++ b/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,12 +276,10 @@ wxToolBarToolBase* wxToolBar::InsertTool( return pTool; } // end of wxToolBar::InsertTool -bool wxToolBar::DoInsertTool( - size_t WXUNUSED(nPos) -, wxToolBarToolBase* pToolBase -) +bool wxToolBar::DoInsertTool( size_t WXUNUSED(nPos), + wxToolBarToolBase* pToolBase ) { - wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; + wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; pTool->m_vX = m_vXPos; if (pTool->m_vX == -1) @@ -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( - size_t WXUNUSED(nPos) -, wxToolBarToolBase* pTool -) +bool wxToolBar::DoDeleteTool( size_t WXUNUSED(nPos), + wxToolBarToolBase* pTool ) { pTool->Detach(); Refresh(); - return TRUE; + return true; } // end of wxToolBar::DoDeleteTool -bool wxToolBar::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rsName -) +bool wxToolBar::Create( wxWindow* pParent, + wxWindowID vId, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + 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; - return TRUE; + m_bInitialized = 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 - ,FALSE - ); + RaiseTool( pTool, 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 - ,FALSE - ); + RaiseTool( pOldTool, FALSE ); m_nCurrentTool = pTool->GetId(); OnMouseEnter(m_nCurrentTool); if (!pTool->GetShortHelp().empty()) @@ -810,27 +801,20 @@ void wxToolBar::OnMouseEvent( // drawing // ---------------------------------------------------------------------------- -void wxToolBar::DrawTool( - wxToolBarToolBase* pTool -) +void wxToolBar::DrawTool( wxToolBarToolBase* pTool ) { - wxClientDC vDc(this); + wxClientDC vDc(this); - DrawTool( vDc - ,pTool - ); + DrawTool( vDc, pTool ); } // end of wxToolBar::DrawTool -void wxToolBar::DrawTool( - wxDC& rDc -, wxToolBarToolBase* pToolBase -) +void wxToolBar::DrawTool( 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 ( - wxTimerEvent& rEvent -) +void wxToolBar::OnTimer ( wxTimerEvent& rEvent ) { if (rEvent.GetId() == m_vToolTimer.GetTimerId()) { - wxPoint vPos( m_vXMouse - ,m_vYMouse - ); + wxPoint vPos( m_vXMouse, m_vYMouse ); m_pToolTip->DisplayToolTipWindow(vPos); m_vToolTimer.Stop(); diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp index 8d2f51ee16..db49861dda 100644 --- a/src/palmos/frame.cpp +++ b/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__ diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp index 247c714c41..859faae02d 100644 --- a/src/palmos/mdi.cpp +++ b/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 // --------------------------------------------------------------------------- diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp index 7c1f0fa055..f89cc657c1 100644 --- a/src/xrc/xh_toolb.cpp +++ b/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() -- 2.45.2