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

Oops, compile errors...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-11 10:49:46 +00:00
parent 5d9dba5b1a
commit f3979fcc3b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/motif/toolbar.cpp
View File

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