X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66f55ec64c250fc51147815bf905a86e943bfd16..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/motif/toolbar.cpp?ds=sidebyside diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index 9a79f005ba..a7faa4d42a 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -21,6 +21,10 @@ #pragma implementation "toolbar.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#endif + #include "wx/wx.h" #include "wx/app.h" #include "wx/timer.h" @@ -47,7 +51,7 @@ // ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) #endif // ---------------------------------------------------------------------------- @@ -192,7 +196,7 @@ bool wxToolBar::Create(wxWindow *parent, m_windowId = id; SetName(name); - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); m_foregroundColour = parent->GetForegroundColour(); m_windowStyle = style; @@ -251,7 +255,7 @@ bool wxToolBar::Realize() // Separator spacing const int separatorSize = GetToolSeparation(); // 8; wxSize margins = GetToolMargins(); - wxSize packing = GetToolPacking(); + int packing = GetToolPacking(); int marginX = margins.x; int marginY = margins.y; @@ -274,14 +278,15 @@ bool wxToolBar::Realize() switch ( tool->GetStyle() ) { case wxTOOL_STYLE_CONTROL: + { wxControl* control = tool->GetControl(); wxSize sz = control->GetSize(); - wxSize pos = control->GetPosition(); + wxPoint pos = control->GetPosition(); control->Move(currentX, pos.y); - currentX += sz.x + packing.x; + currentX += sz.x + packing; break; - + } case wxTOOL_STYLE_SEPARATOR: currentX += separatorSize; break; @@ -447,7 +452,7 @@ bool wxToolBar::Realize() XmNwidth, &width, XmNheight, & height, NULL); - currentX += width + packing.x; + currentX += width + packing; buttonHeight = wxMax(buttonHeight, height); }