X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcb35b5f0577a323f3289f78cb6c7b3b39217397..f156e20c8e21594f901bfce15db4459208ec9571:/src/motif/toolbar.cpp?ds=sidebyside diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index 03f2e08a9e..4078d2eefe 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "toolbar.h" #endif @@ -25,10 +25,11 @@ #define XtDisplay XTDISPLAY #endif -#include "wx/wx.h" +#include "wx/settings.h" #include "wx/app.h" #include "wx/timer.h" #include "wx/toolbar.h" +#include "wx/frame.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -45,13 +46,14 @@ #endif #include "wx/motif/private.h" +#include "wx/motif/bmpmotif.h" // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) #endif // ---------------------------------------------------------------------------- @@ -107,14 +109,22 @@ public: void SetWidget(Widget widget) { m_widget = widget; } Widget GetButtonWidget() const { return m_widget; } - void SetPixmap(Pixmap pixmap) { m_pixmap = pixmap; } - Pixmap GetPixmap() const { return m_pixmap; } + Pixmap GetArmPixmap() + { + m_bitmapCache.SetBitmap( GetNormalBitmap() ); + return (Pixmap)m_bitmapCache.GetArmPixmap( (WXWidget)m_widget ); + } + Pixmap GetInsensPixmap() + { + m_bitmapCache.SetBitmap( GetNormalBitmap() ); + return (Pixmap)m_bitmapCache.GetInsensPixmap( (WXWidget)m_widget ); + } protected: void Init(); Widget m_widget; - Pixmap m_pixmap; + wxBitmapCache m_bitmapCache; }; // ---------------------------------------------------------------------------- @@ -157,16 +167,12 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) void wxToolBarTool::Init() { m_widget = (Widget)0; - m_pixmap = (Pixmap)0; } wxToolBarTool::~wxToolBarTool() { if ( m_widget ) XtDestroyWidget(m_widget); - if ( m_pixmap ) - XmDestroyPixmap(DefaultScreenOfDisplay((Display*)wxGetDisplay()), - m_pixmap); } // ---------------------------------------------------------------------------- @@ -194,18 +200,11 @@ bool wxToolBar::Create(wxWindow *parent, long style, const wxString& name) { - Init(); + if( !wxControl::CreateControl( parent, id, pos, size, style, + wxDefaultValidator, name ) ) + return FALSE; - m_windowId = id; - - SetName(name); m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_foregroundColour = parent->GetForegroundColour(); - m_windowStyle = style; - - SetParent(parent); - - if (parent) parent->AddChild(this); Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -230,11 +229,18 @@ bool wxToolBar::Create(wxWindow *parent, m_mainWidget = (WXWidget) toolbar; - m_font = parent->GetFont(); ChangeFont(FALSE); - SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); + wxPoint rPos = pos; + wxSize rSize = size; + + if( rPos.x == -1 ) rPos.x = 0; + if( rPos.y == -1 ) rPos.y = 0; + if( rSize.x == -1 && GetParent() ) + rSize.x = GetParent()->GetSize().x; + + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + rPos.x, rPos.y, rSize.x, rSize.y); ChangeBackgroundColour(); @@ -255,6 +261,8 @@ bool wxToolBar::Realize() return TRUE; } + bool isVertical = GetWindowStyle() & wxTB_VERTICAL; + // Separator spacing const int separatorSize = GetToolSeparation(); // 8; wxSize margins = GetToolMargins(); @@ -265,15 +273,15 @@ bool wxToolBar::Realize() int currentX = marginX; int currentY = marginY; - int buttonHeight = 0; + int buttonHeight = 0, buttonWidth = 0; int currentSpacing = 0; Widget button; Pixmap pixmap, insensPixmap; - wxBitmap bmp; + wxBitmap bmp, insensBmp; - wxToolBarToolsList::Node *node = m_tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node ) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); @@ -285,19 +293,32 @@ bool wxToolBar::Realize() wxControl* control = tool->GetControl(); wxSize sz = control->GetSize(); wxPoint pos = control->GetPosition(); - control->Move(currentX, pos.y); - currentX += sz.x + packing; + // Allow a control to specify a y[x]-offset by setting + // its initial position, but still don't allow it to + // position itself above the top[left] margin. + int controlY = (pos.y > 0) ? pos.y : currentY; + int controlX = (pos.x > 0) ? pos.x : currentX; + control->Move( isVertical ? controlX : currentX, + isVertical ? currentY : controlY ); + if ( isVertical ) + currentY += sz.y + packing; + else + currentX += sz.x + packing; break; } case wxTOOL_STYLE_SEPARATOR: - currentX += separatorSize; + // skip separators for vertical toolbars + if( !isVertical ) + { + currentX += separatorSize; + } break; case wxTOOL_STYLE_BUTTON: button = (Widget) 0; - if ( tool->CanBeToggled() ) + if ( tool->CanBeToggled() && !tool->GetButtonWidget() ) { button = XtVaCreateWidget("toggleButton", xmToggleButtonWidgetClass, (Widget) m_mainWidget, @@ -311,14 +332,18 @@ bool wxToolBar::Realize() XmNmultiClick, XmMULTICLICK_KEEP, XmNlabelType, XmPIXMAP, NULL); - XtAddCallback ((Widget) button, XmNvalueChangedCallback, (XtCallbackProc) wxToolButtonCallback, - (XtPointer) this); + XtAddCallback ((Widget) button, + XmNvalueChangedCallback, + (XtCallbackProc) wxToolButtonCallback, + (XtPointer) this); XtVaSetValues ((Widget) button, - XmNselectColor, m_backgroundColour.AllocColour(XtDisplay((Widget) button)), - NULL); + XmNselectColor, + m_backgroundColour.AllocColour + (XtDisplay((Widget) button)), + NULL); } - else + else if( !tool->GetButtonWidget() ) { button = XtVaCreateWidget("button", xmPushButtonWidgetClass, (Widget) m_mainWidget, @@ -328,31 +353,52 @@ bool wxToolBar::Realize() XmNlabelType, XmPIXMAP, NULL); XtAddCallback (button, - XmNactivateCallback, (XtCallbackProc) wxToolButtonCallback, - (XtPointer) this); + XmNactivateCallback, + (XtCallbackProc) wxToolButtonCallback, + (XtPointer) this); } - DoChangeBackgroundColour((WXWidget) button, m_backgroundColour, TRUE); + if( !tool->GetButtonWidget() ) + { + wxDoChangeBackgroundColour((WXWidget) button, + m_backgroundColour, TRUE); - tool->SetWidget(button); + tool->SetWidget(button); + } + else + { + button = (Widget)tool->GetButtonWidget(); + XtVaSetValues( button, + XmNx, currentX, XmNy, currentY, + NULL ); + } // For each button, if there is a mask, we must create // a new wxBitmap that has the correct background colour // for the button. Otherwise the background will just be // e.g. black if a transparent XPM has been loaded. bmp = tool->GetNormalBitmap(); - if ( bmp.GetMask() ) + insensBmp = tool->GetDisabledBitmap(); + if ( bmp.GetMask() || insensBmp.GetMask() ) { int backgroundPixel; XtVaGetValues(button, XmNbackground, &backgroundPixel, - NULL); + NULL); wxColour col; col.SetPixel(backgroundPixel); - bmp = wxCreateMaskedBitmap(bmp, col); + if( bmp.Ok() && bmp.GetMask() ) + { + bmp = wxCreateMaskedBitmap(bmp, col); + tool->SetNormalBitmap(bmp); + } - tool->SetNormalBitmap(bmp); + if( insensBmp.Ok() && insensBmp.GetMask() ) + { + insensBmp = wxCreateMaskedBitmap(insensBmp, col); + tool->SetDisabledBitmap(insensBmp); + } } // Create a selected/toggled bitmap. If there isn't a 2nd @@ -361,61 +407,27 @@ bool wxToolBar::Realize() int backgroundPixel; if ( tool->CanBeToggled() ) XtVaGetValues(button, XmNselectColor, &backgroundPixel, - NULL); + NULL); else XtVaGetValues(button, XmNarmColor, &backgroundPixel, - NULL); - + NULL); wxColour col; col.SetPixel(backgroundPixel); - // FIXME: we use disabled bitmap as the bitmap for the toggled - // state, we probably need a GetToggledBitmap() instead - wxBitmap bmpToggled = tool->GetDisabledBitmap(); - if ( bmpToggled.Ok() && bmpToggled.GetMask()) - { - // Use what's there - wxBitmap newBitmap = wxCreateMaskedBitmap(bmpToggled, col); - tool->SetDisabledBitmap(newBitmap); - } - else + pixmap = (Pixmap) bmp.GetDrawable(); { - // Use unselected bitmap - if ( bmp.GetMask() ) - { - wxBitmap newBitmap = wxCreateMaskedBitmap(bmp, col); - tool->SetDisabledBitmap(newBitmap); - } - else - tool->SetDisabledBitmap(bmp); - } - - // FIXME: and here we should use GetDisabledBitmap()... - pixmap = (Pixmap) bmp.GetPixmap(); - insensPixmap = (Pixmap) bmp.GetInsensPixmap(); + wxBitmap tmp = tool->GetDisabledBitmap(); + insensPixmap = tmp.Ok() ? + (Pixmap)tmp.GetDrawable() : + tool->GetInsensPixmap(); + } + if (tool->CanBeToggled()) { // Toggle button - Pixmap pixmap2 = (Pixmap) 0; - Pixmap insensPixmap2 = (Pixmap) 0; - - // If there's a bitmap for the toggled state, use it, - // otherwise generate one. - // - // FIXME: see above - if ( bmpToggled.Ok() ) - { - pixmap2 = (Pixmap) bmpToggled.GetPixmap(); - insensPixmap2 = (Pixmap) bmpToggled.GetInsensPixmap(); - } - else - { - pixmap2 = (Pixmap) bmp.GetArmPixmap(button); - insensPixmap2 = XCreateInsensitivePixmap((Display*) wxGetDisplay(), pixmap2); - } - - tool->SetPixmap(pixmap2); + Pixmap pixmap2 = tool->GetArmPixmap(); + Pixmap insensPixmap2 = tool->GetInsensPixmap(); XtVaSetValues (button, XmNfillOnSelect, True, @@ -428,21 +440,7 @@ bool wxToolBar::Realize() } else { - Pixmap pixmap2 = (Pixmap) 0; - - // If there's a bitmap for the armed state, use it, - // otherwise generate one. - if ( bmpToggled.Ok() ) - { - pixmap2 = (Pixmap) bmpToggled.GetPixmap(); - } - else - { - pixmap2 = (Pixmap) bmp.GetArmPixmap(button); - - } - - tool->SetPixmap(pixmap2); + Pixmap pixmap2 = tool->GetArmPixmap(); // Normal button XtVaSetValues(button, @@ -460,8 +458,12 @@ bool wxToolBar::Realize() XmNwidth, &width, XmNheight, & height, NULL); - currentX += width + packing; + if ( isVertical ) + currentY += height + packing; + else + currentX += width + packing; buttonHeight = wxMax(buttonHeight, height); + buttonWidth = wxMax(buttonWidth, width); } XtAddEventHandler (button, EnterWindowMask | LeaveWindowMask, @@ -474,7 +476,9 @@ bool wxToolBar::Realize() node = node->GetNext(); } - SetSize(-1, -1, currentX, buttonHeight + 2*marginY); + SetSize( -1, -1, + isVertical ? buttonWidth + 2 * marginX : -1, + isVertical ? -1 : buttonHeight + 2*marginY ); return TRUE; } @@ -494,10 +498,91 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) return TRUE; } -bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) +bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) { tool->Detach(); + bool isVertical = GetWindowStyle() & wxTB_VERTICAL; + const int separatorSize = GetToolSeparation(); // 8; + int packing = GetToolPacking(); + int offset = 0; + + for( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + node; node = node->GetNext() ) + { + wxToolBarTool *t = (wxToolBarTool*)node->GetData(); + + if( t == tool ) + { + switch ( t->GetStyle() ) + { + case wxTOOL_STYLE_CONTROL: + { + wxSize size = t->GetControl()->GetSize(); + offset = isVertical ? size.y : size.x; + offset += packing; + break; + } + case wxTOOL_STYLE_SEPARATOR: + offset = isVertical ? 0 : separatorSize; + break; + case wxTOOL_STYLE_BUTTON: + { + Widget w = t->GetButtonWidget(); + Dimension width, height; + + XtVaGetValues( w, + XmNwidth, &width, + XmNheight, &height, + NULL ); + + offset = isVertical ? height : width; + offset += packing; + break; + } + } + } + else if( offset ) + { + switch ( t->GetStyle() ) + { + case wxTOOL_STYLE_CONTROL: + { + wxPoint pos = t->GetControl()->GetPosition(); + + if( isVertical ) + pos.y -= offset; + else + pos.x -= offset; + + t->GetControl()->Move( pos ); + break; + } + case wxTOOL_STYLE_SEPARATOR: + break; + case wxTOOL_STYLE_BUTTON: + { + Dimension x, y; + XtVaGetValues( t->GetButtonWidget(), + XmNx, &x, + XmNy, &y, + NULL ); + + if( isVertical ) + y -= offset; + else + x -= offset; + + XtVaSetValues( t->GetButtonWidget(), + XmNx, x, + XmNy, y, + NULL ); + break; + } + } + } + } + return TRUE; } @@ -521,13 +606,45 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool), // nothing to do } +void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags) +{ + int old_width, old_height; + GetSize(&old_width, &old_height); + + // Correct width and height if needed. + if ( width == -1 || height == -1 ) + { + wxSize defaultSize = GetSize(); + + if ( width == -1 ) + width = defaultSize.x; + if ( height == -1 ) + height = defaultSize.y; + } + + wxToolBarBase::DoSetSize(x, y, width, height, sizeFlags); + + // We must refresh the frame size when the toolbar changes size + // otherwise the toolbar can be shown incorrectly + if ( old_width != width || old_height != height ) + { + // But before we send the size event check it + // we have a frame that is not being deleted. + wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); + if ( frame && !frame->IsBeingDeleted() ) + { + frame->SendSizeEvent(); + } + } +} + // ---------------------------------------------------------------------------- // Motif callbacks // ---------------------------------------------------------------------------- wxToolBarToolBase *wxToolBar::FindToolByWidget(WXWidget w) const { - wxToolBarToolsList::Node* node = m_tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node ) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData();