Unicode compilation fixes after wxFFile change

[wxWidgets.git] / src / motif / toolbar.cpp

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index 03f2e08a9e3f6cdbc8ada9fa4409b0174bf27d98..a96885dd6cdd90f538c8c23bb0a62bd33ea8c1dc 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -29,6 +29,7 @@
 #include "wx/app.h"
 #include "wx/timer.h"
 #include "wx/toolbar.h"
+#include "wx/frame.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -164,9 +165,8 @@ wxToolBarTool::~wxToolBarTool()
 {
     if ( m_widget )
         XtDestroyWidget(m_widget);
-    if ( m_pixmap )
-        XmDestroyPixmap(DefaultScreenOfDisplay((Display*)wxGetDisplay()),
-                        m_pixmap);
+    // note: do not delete m_pixmap here because it will be deleted
+    //       by the base class when the bitmap is destroyed.
 }
 
 // ----------------------------------------------------------------------------
@@ -194,18 +194,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 +223,19 @@ bool wxToolBar::Create(wxWindow *parent,
 
     m_mainWidget = (WXWidget) toolbar;
 
-    m_font = parent->GetFont();
     ChangeFont(FALSE);
 
+    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;
+
     SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  rPos.x, rPos.y, rSize.x, rSize.y);
 
     ChangeBackgroundColour();
 
@@ -255,6 +256,8 @@ bool wxToolBar::Realize()
         return TRUE;
     }
 
+    bool isVertical = GetWindowStyle() & wxTB_VERTICAL;
+
     // Separator spacing
     const int separatorSize = GetToolSeparation(); // 8;
     wxSize margins = GetToolMargins();
@@ -265,7 +268,7 @@ bool wxToolBar::Realize()
     int currentX = marginX;
     int currentY = marginY;
 
-    int buttonHeight = 0;
+    int buttonHeight = 0, buttonWidth = 0;
 
     int currentSpacing = 0;
 
@@ -285,12 +288,23 @@ 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) ? currentY + pos.y : currentY;
+                int controlX = (pos.x > 0) ? currentX + 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:
+                 // skip separators for vertical toolbars
+                if( isVertical ) break;
                 currentX += separatorSize;
                 break;
 
@@ -349,7 +363,6 @@ bool wxToolBar::Realize()
 
                     wxColour col;
                     col.SetPixel(backgroundPixel);
-
                     bmp = wxCreateMaskedBitmap(bmp, col);
 
                     tool->SetNormalBitmap(bmp);
@@ -365,7 +378,6 @@ bool wxToolBar::Realize()
                 else
                     XtVaGetValues(button, XmNarmColor, &backgroundPixel,
                             NULL);
-
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 
@@ -460,8 +472,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 +490,9 @@ bool wxToolBar::Realize()
         node = node->GetNext();
     }
 
-    SetSize(-1, -1, currentX, buttonHeight + 2*marginY);
+    SetSize( -1, -1,
+             isVertical ? buttonWidth + 2 * marginX : currentX,
+             isVertical ? currentY : buttonHeight +  2*marginY );
 
     return TRUE;
 }
@@ -521,6 +539,39 @@ 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);
+
+    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);
+
+        if ( width == -1 )
+            width = tmp_width;
+        if ( height == -1 )
+            height = tmp_height;
+    }
+  
+    // 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
 // ----------------------------------------------------------------------------