X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00dd3b1897bd74276234f449f68e3f0805eb77dc..1e9bafca0f56de34638d4c3fef8cf74fe9351193:/src/motif/toolbar.cpp diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index c02fbac244..b7a1a782aa 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: motif/toolbar.cpp +// Name: src/motif/toolbar.cpp // Purpose: wxToolBar // Author: Julian Smart // Modified by: 13.12.99 by VZ during toolbar classes reorganization @@ -17,9 +17,8 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "toolbar.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #ifdef __VMS #define XtDisplay XTDISPLAY @@ -46,14 +45,13 @@ #endif #include "wx/motif/private.h" +#include "wx/motif/bmpmotif.h" // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // ---------------------------------------------------------------------------- // private functions @@ -108,14 +106,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; }; // ---------------------------------------------------------------------------- @@ -158,15 +164,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); - // note: do not delete m_pixmap here because it will be deleted - // by the base class when the bitmap is destroyed. } // ---------------------------------------------------------------------------- @@ -196,7 +199,7 @@ bool wxToolBar::Create(wxWindow *parent, { if( !wxControl::CreateControl( parent, id, pos, size, style, wxDefaultValidator, name ) ) - return FALSE; + return false; m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); @@ -223,7 +226,7 @@ bool wxToolBar::Create(wxWindow *parent, m_mainWidget = (WXWidget) toolbar; - ChangeFont(FALSE); + ChangeFont(false); wxPoint rPos = pos; wxSize rSize = size; @@ -233,13 +236,12 @@ bool wxToolBar::Create(wxWindow *parent, if( rSize.x == -1 && GetParent() ) rSize.x = GetParent()->GetSize().x; - SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, rPos.x, rPos.y, rSize.x, rSize.y); ChangeBackgroundColour(); - return TRUE; + return true; } wxToolBar::~wxToolBar() @@ -253,7 +255,7 @@ bool wxToolBar::Realize() if ( m_tools.GetCount() == 0 ) { // nothing to do - return TRUE; + return true; } bool isVertical = GetWindowStyle() & wxTB_VERTICAL; @@ -270,13 +272,11 @@ bool wxToolBar::Realize() 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(); @@ -291,8 +291,8 @@ bool wxToolBar::Realize() // 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) ? currentY + pos.y : currentY; - int controlX = (pos.x > 0) ? currentX + pos.x : currentX; + 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 ) @@ -303,15 +303,17 @@ bool wxToolBar::Realize() break; } case wxTOOL_STYLE_SEPARATOR: - // skip separators for vertical toolbars - if( isVertical ) break; - 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, @@ -325,14 +327,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, @@ -342,30 +348,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); - tool->SetNormalBitmap(bmp); + if( bmp.Ok() && bmp.GetMask() ) + { + bmp = wxCreateMaskedBitmap(bmp, col); + 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 @@ -374,60 +402,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()) + pixmap = (Pixmap) bmp.GetDrawable(); { - // Use what's there - wxBitmap newBitmap = wxCreateMaskedBitmap(bmpToggled, col); - tool->SetDisabledBitmap(newBitmap); - } - else - { - // Use unselected bitmap - if ( bmp.GetMask() ) - { - wxBitmap newBitmap = wxCreateMaskedBitmap(bmp, col); - tool->SetDisabledBitmap(newBitmap); - } - else - tool->SetDisabledBitmap(bmp); - } + wxBitmap tmp = tool->GetDisabledBitmap(); - // FIXME: and here we should use GetDisabledBitmap()... - pixmap = (Pixmap) bmp.GetPixmap(); - insensPixmap = (Pixmap) bmp.GetInsensPixmap(); + 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, @@ -440,21 +435,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, @@ -483,7 +464,6 @@ bool wxToolBar::Realize() XtAddEventHandler (button, EnterWindowMask | LeaveWindowMask, False, wxToolButtonPopupCallback, (XtPointer) this); - currentSpacing = 0; break; } @@ -491,10 +471,10 @@ bool wxToolBar::Realize() } SetSize( -1, -1, - isVertical ? buttonWidth + 2 * marginX : currentX, - isVertical ? currentY : buttonHeight + 2*marginY ); + isVertical ? buttonWidth + 2 * marginX : -1, + isVertical ? -1 : buttonHeight + 2*marginY ); - return TRUE; + return true; } wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x), @@ -509,21 +489,106 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) { tool->Attach(this); - return TRUE; + return true; } bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) { tool->Detach(); - return TRUE; + 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 location = t->GetControl()->GetPosition(); + + if( isVertical ) + location.y -= offset; + else + location.x -= offset; + + t->GetControl()->Move( location ); + break; + } + case wxTOOL_STYLE_SEPARATOR: + break; + case wxTOOL_STYLE_BUTTON: + { + Dimension x, y; + XtVaGetValues( t->GetButtonWidget(), + XmNx, &x, + XmNy, &y, + NULL ); + + if( isVertical ) + y = (Dimension)(y - offset); + else + x = (Dimension)(x - offset); + + XtVaSetValues( t->GetButtonWidget(), + XmNx, x, + XmNy, y, + NULL ); + break; + } + } + } + } + + return true; } void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { wxToolBarTool *tool = (wxToolBarTool *)toolBase; - - XtSetSensitive(tool->GetButtonWidget(), (Boolean) enable); + if (tool->GetButtonWidget()){ + XtSetSensitive(tool->GetButtonWidget(), (Boolean) enable); + } else if (wxTOOL_STYLE_CONTROL == tool->GetStyle()){ + // Controls (such as wxChoice) do not have button widgets + tool->GetControl()->Enable(enable); + } } void wxToolBar::DoToggleTool(wxToolBarToolBase *toolBase, bool toggle) @@ -544,25 +609,24 @@ void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags) int old_width, old_height; GetSize(&old_width, &old_height); - wxToolBarBase::DoSetSize(x, y, width, height, sizeFlags); - // Correct width and height if needed. if ( width == -1 || height == -1 ) { - int tmp_width, tmp_height; - GetSize(&tmp_width, &tmp_height); + wxSize defaultSize = GetSize(); if ( width == -1 ) - width = tmp_width; + width = defaultSize.x; if ( height == -1 ) - height = tmp_height; + 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 + // 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() ) @@ -578,7 +642,7 @@ void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags) 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(); @@ -650,7 +714,7 @@ static void wxToolButtonPopupCallback(Widget w, wxToolBarTimer::help_popup = (Widget) 0; // One shot - wxTheToolBarTimer->Start(delayMilli, TRUE); + wxTheToolBarTimer->Start(delayMilli, true); } /************************************************************/ @@ -690,7 +754,7 @@ void wxToolBarTimer::Notify() // Move the tooltip more or less above the button int yOffset = 20; // TODO: What should be really? - y -= yOffset; + y = (Position)(y - yOffset); if (y < yOffset) y = 0; /************************************************************/