/////////////////////////////////////////////////////////////////////////////
-// Name: toolbar.cpp
+// Name: src/mac/classic/toolbar.cpp
// Purpose: wxToolBar
// Author: Stefan Csomor
// Modified by:
// 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"
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"
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 ; }
wxPoint GetPosition() const
{
return wxPoint(m_x, m_y);
- }
+ }
private :
- void Init()
+ void Init()
{
m_controlHandle = NULL ;
}
{
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 )
{
{
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 ) ;
{
::SetControl32BitValue( m_controlHandle , 0 ) ;
}
-
+
ControlHandle container = (ControlHandle) tbar->MacGetContainerForEmbedding() ;
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
::EmbedControl( m_controlHandle , container ) ;
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)
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 ;
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
}
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;
{
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 ;
node = node->GetNext();
}
-
+
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
{
if ( m_maxRows == 0 )
// if not set yet, only one row
SetRows(1);
}
- maxWidth = tw ;
+ maxWidth = tw ;
maxHeight += m_yMargin + kwxMacToolBarTopMargin;
m_maxHeight = maxHeight ;
}
maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
m_maxWidth = maxWidth ;
}
-
+
SetSize(maxWidth, maxHeight);
InvalidateBestSize();
-
- return TRUE;
+
+ return true;
}
void wxToolBar::SetToolBitmapSize(const wxSize& size)
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() )
{
m_maxRows = nRows;
}
-void wxToolBar::MacSuperChangedPosition()
+void wxToolBar::MacSuperChangedPosition()
{
wxWindow::MacSuperChangedPosition() ;
Realize() ;
tool->Attach(this);
InvalidateBestSize();
- return TRUE;
+ return true;
}
void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
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();
}
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() ) ;
}
}
-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 ) )
}
#endif // wxUSE_TOOLBAR
-
/////////////////////////////////////////////////////////////////////////////
-// Name: toolbar.cpp
+// Name: src/os2/toolbar.cpp
// Purpose: wxToolBar
// Author: David Webster
// Modified by:
#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
+#include "wx/toolbar.h"
+
#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/window.h"
#endif
#include "wx/tooltip.h"
-#include "wx/toolbar.h"
-bool wxToolBar::m_bInitialized = FALSE;
+bool wxToolBar::m_bInitialized = false;
// ----------------------------------------------------------------------------
// private classes
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)
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
,lStyle
,rsName
))
- return FALSE;
+ return false;
// Set it to grey (or other 3D face colour)
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
,nWidth
,nHeight
);
- return TRUE;
+ return true;
} // end of wxToolBar::Create
wxToolBar::~wxToolBar()
m_maxWidth += m_xMargin;
m_maxHeight += m_yMargin;
- m_bInitialized = TRUE;
- return TRUE;
+ m_bInitialized = true;
+ return true;
} // end of wxToolBar::Realize
// ----------------------------------------------------------------------------
pTool = (wxToolBarTool *)FindById(m_nCurrentTool);
if (pTool && !pTool->IsToggled())
{
- RaiseTool( pTool
- ,FALSE
- );
+ RaiseTool( pTool, FALSE );
}
m_nCurrentTool = -1;
OnMouseEnter(-1);
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())
// 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);
return;
if ((pMask = vBitmap.GetMask()) != NULL)
if (pMask->GetMaskBitmap() != NULLHANDLE)
- bUseMask = TRUE;
+ bUseMask = true;
if (!pTool->IsToggled())
{
}
} // 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();
projects / wxWidgets.git / commitdiff
