projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidied/commented FL header files, regenerated docs and filled out Category section.
[wxWidgets.git]
/
src
/
motif
/
toolbar.cpp
diff --git
a/src/motif/toolbar.cpp
b/src/motif/toolbar.cpp
index fec5196fb154ec72a0c1346e3c44c1abca8c3aba..a7faa4d42aff45e8224bddc42b4744c2bd0f72ef 100644
(file)
--- a/
src/motif/toolbar.cpp
+++ b/
src/motif/toolbar.cpp
@@
-21,6
+21,10
@@
#pragma implementation "toolbar.h"
#endif
#pragma implementation "toolbar.h"
#endif
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
#include "wx/wx.h"
#include "wx/app.h"
#include "wx/timer.h"
#include "wx/wx.h"
#include "wx/app.h"
#include "wx/timer.h"
@@
-47,7
+51,7
@@
// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
Control
)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
ToolBarBase
)
#endif
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------
@@
-192,7
+196,7
@@
bool wxToolBar::Create(wxWindow *parent,
m_windowId = id;
SetName(name);
m_windowId = id;
SetName(name);
- m_backgroundColour = wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_3DFACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_foregroundColour = parent->GetForegroundColour();
m_windowStyle = style;
m_foregroundColour = parent->GetForegroundColour();
m_windowStyle = style;
@@
-251,6
+255,7
@@
bool wxToolBar::Realize()
// Separator spacing
const int separatorSize = GetToolSeparation(); // 8;
wxSize margins = GetToolMargins();
// Separator spacing
const int separatorSize = GetToolSeparation(); // 8;
wxSize margins = GetToolMargins();
+ int packing = GetToolPacking();
int marginX = margins.x;
int marginY = margins.y;
int marginX = margins.x;
int marginY = margins.y;
@@
-273,9
+278,15
@@
bool wxToolBar::Realize()
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_CONTROL:
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_CONTROL:
- wxFAIL_MSG( _T("not implemented") );
- break;
+ {
+ wxControl* control = tool->GetControl();
+ wxSize sz = control->GetSize();
+ wxPoint pos = control->GetPosition();
+ control->Move(currentX, pos.y);
+ currentX += sz.x + packing;
+ break;
+ }
case wxTOOL_STYLE_SEPARATOR:
currentX += separatorSize;
break;
case wxTOOL_STYLE_SEPARATOR:
currentX += separatorSize;
break;
@@
-441,7
+452,7
@@
bool wxToolBar::Realize()
XmNwidth, &width,
XmNheight, & height,
NULL);
XmNwidth, &width,
XmNheight, & height,
NULL);
- currentX += width +
marginX
;
+ currentX += width +
packing
;
buttonHeight = wxMax(buttonHeight, height);
}
buttonHeight = wxMax(buttonHeight, height);
}