Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final adjustements to wxToolbar to make it layout as on other platforms

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-03-01 06:50:39 +00:00
parent 8b63ae37ee
commit 895f5af753
2 changed files with 94 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/mac/carbon/toolbar.cpp
View File

@@ -79,8 +79,11 @@ private:
// wxToolBarTool // wxToolBarTool
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
const short defwidth = 24 ; const short kwxMacToolBarToolDefaultWidth = 24 ;
const short defheight = 22 ; const short kwxMacToolBarToolDefaultHeight = 22 ;
const short kwxMacToolBarTopMargin = 2 ;
const short kwxMacToolBarLeftMargin = 2 ;
wxToolBarToolBase *wxToolBar::CreateTool(int id, wxToolBarToolBase *wxToolBar::CreateTool(int id,
const wxBitmap& bitmap1, const wxBitmap& bitmap1,
@@ -103,18 +106,14 @@ void wxToolBar::Init()
{ {
m_maxWidth = -1; m_maxWidth = -1;
m_maxHeight = -1; m_maxHeight = -1;
m_defaultWidth = defwidth; m_defaultWidth = kwxMacToolBarToolDefaultWidth;
m_defaultHeight = defheight; m_defaultHeight = kwxMacToolBarToolDefaultHeight;
// TODO
} }
bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name) long style, const wxString& name)
{ {
m_defaultWidth = defwidth;
m_defaultHeight = defheight;
int x = pos.x; int x = pos.x;
int y = pos.y; int y = pos.y;
int width = size.x; int width = size.x;
@@ -128,40 +127,30 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
x = 0; x = 0;
if (y < 0) if (y < 0)
y = 0; y = 0;
#if 1
{
SetName(name);
m_windowStyle = style; SetName(name);
parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ; m_windowStyle = style;
m_foregroundColour = parent->GetForegroundColour() ; parent->AddChild(this);
if (id == -1) m_backgroundColour = parent->GetBackgroundColour() ;
m_windowId = NewControlId(); m_foregroundColour = parent->GetForegroundColour() ;
else
m_windowId = id;
m_width = size.x ; if (id == -1)
m_height = size.y ; m_windowId = NewControlId();
int x = pos.x ; else
int y = pos.y ; m_windowId = id;
AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
m_x = x ;
m_y = y ;
}
#else
Rect bounds ;
Str255 title ;
MacPreControlCreate( parent , id , "" , wxPoint( x , y ) , wxSize( width , height ) ,style, wxDefaultValidator , name , &bounds , title ) ; {
m_width = size.x ;
m_height = size.y ;
int x = pos.x ;
int y = pos.y ;
AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
m_x = x ;
m_y = y ;
}
m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1,
kControlPlacardProc , (long) this ) ;
MacPostControlCreate() ;
#endif
return TRUE;
} }
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
@@ -254,9 +243,6 @@ PicHandle MakePict(GWorldPtr wp, GWorldPtr mask )
return pict; // return our groovy pict handle return pict; // return our groovy pict handle
} }
const short kwxMacToolBarTopMargin = 2 ;
const short kwxMacToolBarLeftMargin = 2 ;
bool wxToolBar::Realize() bool wxToolBar::Realize()
{ {
if (m_tools.Number() == 0) if (m_tools.Number() == 0)
@@ -282,7 +268,10 @@ bool wxToolBar::Realize()
wxSize toolSize = GetToolSize() ; wxSize toolSize = GetToolSize() ;
int tw, th; int tw, th;
GetSize(& tw, & th); GetSize(& tw, & th);
m_maxWidth = m_maxHeight = 0 ;
int maxWidth = 0 ;
int maxHeight = 0 ;
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); wxToolBarTool *tool = (wxToolBarTool *)node->Data();
@@ -290,7 +279,7 @@ bool wxToolBar::Realize()
if( !tool->IsSeparator() ) if( !tool->IsSeparator() )
{ {
Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ; Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
toolrect.right = toolrect.left + toolSize.x ; toolrect.right = toolrect.left + toolSize.x ;
toolrect.bottom = toolrect.top + toolSize.y ; toolrect.bottom = toolrect.top + toolSize.y ;
@@ -357,10 +346,10 @@ bool wxToolBar::Realize()
m_macToolHandles.Add( NULL ) ; m_macToolHandles.Add( NULL ) ;
x += (int)toolSize.x / 4; x += (int)toolSize.x / 4;
} }
if ( toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h > m_maxWidth) if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h; maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
if (toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v > m_maxHeight) if (toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v ; maxHeight = toolbarrect.top + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
node = node->Next(); node = node->Next();
} }
@@ -372,11 +361,10 @@ bool wxToolBar::Realize()
// if not set yet, only one row // if not set yet, only one row
SetRows(1); SetRows(1);
} }
m_maxWidth = clipRect.right - m_x ; maxWidth = tw ;
//m_maxWidth = tw ; // +=toolSize.x; maxHeight += toolSize.y;
//m_maxWidth += m_xMargin ; maxHeight += m_yMargin + kwxMacToolBarTopMargin;
m_maxHeight += toolSize.y; m_maxHeight = maxHeight ;
m_maxHeight += m_yMargin;
} }
else else
{ {
@@ -385,13 +373,13 @@ bool wxToolBar::Realize()
// if not set yet, have one column // if not set yet, have one column
SetRows(noButtons); SetRows(noButtons);
} }
m_maxHeight = clipRect.bottom - m_y ; maxHeight = th ;
//m_maxHeight += m_yMargin ; maxWidth += toolSize.x;
m_maxWidth += toolSize.x; maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
m_maxWidth += m_xMargin; m_maxWidth = maxWidth ;
} }
SetSize(m_maxWidth, m_maxHeight); SetSize(maxWidth, maxHeight);
return TRUE; return TRUE;
} }
@@ -546,20 +534,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
parent = parent->GetParent() ; parent = parent->GetParent() ;
} }
int w = m_width ;
int h = m_height ;
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
{
w = clipRect.right - m_x ;
}
else
{
h = clipRect.bottom - m_y ;
}
Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h ,
m_y + localOrigin.v + h , m_x + localOrigin.h + w } ; m_y + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
{ {
@@ -575,55 +552,8 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
wxDC::MacInvalidateSetup() ; wxDC::MacInvalidateSetup() ;
} }
/*
WindowRef window = GetMacRootWindow() ;
if ( window )
{
wxWindow* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
wxMacDrawingHelper help( win ) ;
// the mac control manager always assumes to have the origin at 0,0
SetOrigin( 0 , 0 ) ;
bool hasTabBehind = false ;
wxWindow* parent = GetParent() ;
while ( parent )
{
if( parent->MacGetWindowData() )
{
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
break ;
}
if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
{
if ( ((wxControl*)parent)->GetMacControl() )
SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
break ;
}
parent = parent->GetParent() ;
}
Rect toolbarrect = { m_y , m_x , m_y + m_height , m_x + m_width } ;
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
{
int index = 0 ;
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
{
if ( m_macToolHandles[index] )
{
UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
}
}
}
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
wxDC::MacInvalidateSetup() ;
}
}
*/
} }
void wxToolBar::OnMouse( wxMouseEvent &event ) void wxToolBar::OnMouse( wxMouseEvent &event )
{ {
@@ -663,10 +593,6 @@ void wxToolBar::OnMouse( wxMouseEvent &event )
controlpart = FindControl( localwhere , window , &control ) ; controlpart = FindControl( localwhere , window , &control ) ;
{ {
if ( AcceptsFocus() && FindFocus() != this )
{
SetFocus() ;
}
if ( control && UMAIsControlActive( control ) ) if ( control && UMAIsControlActive( control ) )
{ {
{ {

164
src/mac/toolbar.cpp
View File

@@ -79,8 +79,11 @@ private:
// wxToolBarTool // wxToolBarTool
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
const short defwidth = 24 ; const short kwxMacToolBarToolDefaultWidth = 24 ;
const short defheight = 22 ; const short kwxMacToolBarToolDefaultHeight = 22 ;
const short kwxMacToolBarTopMargin = 2 ;
const short kwxMacToolBarLeftMargin = 2 ;
wxToolBarToolBase *wxToolBar::CreateTool(int id, wxToolBarToolBase *wxToolBar::CreateTool(int id,
const wxBitmap& bitmap1, const wxBitmap& bitmap1,
@@ -103,18 +106,14 @@ void wxToolBar::Init()
{ {
m_maxWidth = -1; m_maxWidth = -1;
m_maxHeight = -1; m_maxHeight = -1;
m_defaultWidth = defwidth; m_defaultWidth = kwxMacToolBarToolDefaultWidth;
m_defaultHeight = defheight; m_defaultHeight = kwxMacToolBarToolDefaultHeight;
// TODO
} }
bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name) long style, const wxString& name)
{ {
m_defaultWidth = defwidth;
m_defaultHeight = defheight;
int x = pos.x; int x = pos.x;
int y = pos.y; int y = pos.y;
int width = size.x; int width = size.x;
@@ -128,40 +127,30 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
x = 0; x = 0;
if (y < 0) if (y < 0)
y = 0; y = 0;
#if 1
{
SetName(name);
m_windowStyle = style; SetName(name);
parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ; m_windowStyle = style;
m_foregroundColour = parent->GetForegroundColour() ; parent->AddChild(this);
if (id == -1) m_backgroundColour = parent->GetBackgroundColour() ;
m_windowId = NewControlId(); m_foregroundColour = parent->GetForegroundColour() ;
else
m_windowId = id;
m_width = size.x ; if (id == -1)
m_height = size.y ; m_windowId = NewControlId();
int x = pos.x ; else
int y = pos.y ; m_windowId = id;
AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
m_x = x ;
m_y = y ;
}
#else
Rect bounds ;
Str255 title ;
MacPreControlCreate( parent , id , "" , wxPoint( x , y ) , wxSize( width , height ) ,style, wxDefaultValidator , name , &bounds , title ) ; {
m_width = size.x ;
m_height = size.y ;
int x = pos.x ;
int y = pos.y ;
AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
m_x = x ;
m_y = y ;
}
m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1,
kControlPlacardProc , (long) this ) ;
MacPostControlCreate() ;
#endif
return TRUE;
} }
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
@@ -254,9 +243,6 @@ PicHandle MakePict(GWorldPtr wp, GWorldPtr mask )
return pict; // return our groovy pict handle return pict; // return our groovy pict handle
} }
const short kwxMacToolBarTopMargin = 2 ;
const short kwxMacToolBarLeftMargin = 2 ;
bool wxToolBar::Realize() bool wxToolBar::Realize()
{ {
if (m_tools.Number() == 0) if (m_tools.Number() == 0)
@@ -282,7 +268,10 @@ bool wxToolBar::Realize()
wxSize toolSize = GetToolSize() ; wxSize toolSize = GetToolSize() ;
int tw, th; int tw, th;
GetSize(& tw, & th); GetSize(& tw, & th);
m_maxWidth = m_maxHeight = 0 ;
int maxWidth = 0 ;
int maxHeight = 0 ;
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); wxToolBarTool *tool = (wxToolBarTool *)node->Data();
@@ -290,7 +279,7 @@ bool wxToolBar::Realize()
if( !tool->IsSeparator() ) if( !tool->IsSeparator() )
{ {
Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ; Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
toolrect.right = toolrect.left + toolSize.x ; toolrect.right = toolrect.left + toolSize.x ;
toolrect.bottom = toolrect.top + toolSize.y ; toolrect.bottom = toolrect.top + toolSize.y ;
@@ -357,10 +346,10 @@ bool wxToolBar::Realize()
m_macToolHandles.Add( NULL ) ; m_macToolHandles.Add( NULL ) ;
x += (int)toolSize.x / 4; x += (int)toolSize.x / 4;
} }
if ( toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h > m_maxWidth) if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h; maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
if (toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v > m_maxHeight) if (toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v ; maxHeight = toolbarrect.top + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
node = node->Next(); node = node->Next();
} }
@@ -372,11 +361,10 @@ bool wxToolBar::Realize()
// if not set yet, only one row // if not set yet, only one row
SetRows(1); SetRows(1);
} }
m_maxWidth = clipRect.right - m_x ; maxWidth = tw ;
//m_maxWidth = tw ; // +=toolSize.x; maxHeight += toolSize.y;
//m_maxWidth += m_xMargin ; maxHeight += m_yMargin + kwxMacToolBarTopMargin;
m_maxHeight += toolSize.y; m_maxHeight = maxHeight ;
m_maxHeight += m_yMargin;
} }
else else
{ {
@@ -385,13 +373,13 @@ bool wxToolBar::Realize()
// if not set yet, have one column // if not set yet, have one column
SetRows(noButtons); SetRows(noButtons);
} }
m_maxHeight = clipRect.bottom - m_y ; maxHeight = th ;
//m_maxHeight += m_yMargin ; maxWidth += toolSize.x;
m_maxWidth += toolSize.x; maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
m_maxWidth += m_xMargin; m_maxWidth = maxWidth ;
} }
SetSize(m_maxWidth, m_maxHeight); SetSize(maxWidth, maxHeight);
return TRUE; return TRUE;
} }
@@ -546,20 +534,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
parent = parent->GetParent() ; parent = parent->GetParent() ;
} }
int w = m_width ;
int h = m_height ;
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
{
w = clipRect.right - m_x ;
}
else
{
h = clipRect.bottom - m_y ;
}
Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h ,
m_y + localOrigin.v + h , m_x + localOrigin.h + w } ; m_y + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
{ {
@@ -575,55 +552,8 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
wxDC::MacInvalidateSetup() ; wxDC::MacInvalidateSetup() ;
} }
/*
WindowRef window = GetMacRootWindow() ;
if ( window )
{
wxWindow* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
wxMacDrawingHelper help( win ) ;
// the mac control manager always assumes to have the origin at 0,0
SetOrigin( 0 , 0 ) ;
bool hasTabBehind = false ;
wxWindow* parent = GetParent() ;
while ( parent )
{
if( parent->MacGetWindowData() )
{
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
break ;
}
if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
{
if ( ((wxControl*)parent)->GetMacControl() )
SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
break ;
}
parent = parent->GetParent() ;
}
Rect toolbarrect = { m_y , m_x , m_y + m_height , m_x + m_width } ;
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
{
int index = 0 ;
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
{
if ( m_macToolHandles[index] )
{
UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
}
}
}
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
wxDC::MacInvalidateSetup() ;
}
}
*/
} }
void wxToolBar::OnMouse( wxMouseEvent &event ) void wxToolBar::OnMouse( wxMouseEvent &event )
{ {
@@ -663,10 +593,6 @@ void wxToolBar::OnMouse( wxMouseEvent &event )
controlpart = FindControl( localwhere , window , &control ) ; controlpart = FindControl( localwhere , window , &control ) ;
{ {
if ( AcceptsFocus() && FindFocus() != this )
{
SetFocus() ;
}
if ( control && UMAIsControlActive( control ) ) if ( control && UMAIsControlActive( control ) )
{ {
{ {