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

Doc corrections, wxMotif toolbar AddControl implementation (untested as yet)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-10 16:06:33 +00:00
parent 723d1b1da1
commit 66f55ec64c
12 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/motif/toolbar.cpp
View File

@@ -251,6 +251,7 @@ bool wxToolBar::Realize()
// Separator spacing
const int separatorSize = GetToolSeparation(); // 8;
wxSize margins = GetToolMargins();
wxSize packing = GetToolPacking();
int marginX = margins.x;
int marginY = margins.y;
@@ -273,7 +274,12 @@ bool wxToolBar::Realize()
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_CONTROL:
wxFAIL_MSG( _T("not implemented") );
wxControl* control = tool->GetControl();
wxSize sz = control->GetSize();
wxSize pos = control->GetPosition();
control->Move(currentX, pos.y);
currentX += sz.x + packing.x;
break;
case wxTOOL_STYLE_SEPARATOR:
@@ -441,7 +447,7 @@ bool wxToolBar::Realize()
XmNwidth, &width,
XmNheight, & height,
NULL);
currentX += width + marginX;
currentX += width + packing.x;
buttonHeight = wxMax(buttonHeight, height);
}