use ZIP entry modification time, not the (inexistent) file modification time

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

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index 4c685aada7802729bd7cc2700f647ff5173f44ab..dce201528dd20fc637f18d182ef956ed16f0fad0 100644 (file)
--- 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
 // Purpose:     wxToolBar
 // Author:      Julian Smart
 // Modified by: 13.12.99 by VZ during toolbar classes reorganization


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "toolbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,11 +24,14 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/settings.h"
-#include "wx/app.h"
-#include "wx/timer.h"

 #include "wx/toolbar.h"
 #include "wx/toolbar.h"

-#include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -421,7 +420,7 @@ bool wxToolBar::Realize()
                             (Pixmap)tmp.GetDrawable() :
                             tool->GetInsensPixmap();
                 }
                             (Pixmap)tmp.GetDrawable() :
                             tool->GetInsensPixmap();
                 }

-                
+

                 if (tool->CanBeToggled())
                 {
                     // Toggle button
                 if (tool->CanBeToggled())
                 {
                     // Toggle button


@@ -496,7 +495,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
     return true;
 }
 
     return true;
 }
 

-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)

 {
     tool->Detach();
 
 {
     tool->Detach();
 


@@ -520,7 +519,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
                 offset = isVertical ? size.y : size.x;
                 offset += packing;
                 break;
                 offset = isVertical ? size.y : size.x;
                 offset += packing;
                 break;

-            }       
+            }

             case wxTOOL_STYLE_SEPARATOR:
                 offset = isVertical ? 0 : separatorSize;
                 break;
             case wxTOOL_STYLE_SEPARATOR:
                 offset = isVertical ? 0 : separatorSize;
                 break;


@@ -546,14 +545,14 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
             {
             case wxTOOL_STYLE_CONTROL:
             {
             {
             case wxTOOL_STYLE_CONTROL:
             {

-                wxPoint pos = t->GetControl()->GetPosition();
+                wxPoint location = t->GetControl()->GetPosition();

 
                 if( isVertical )
 
                 if( isVertical )

-                    pos.y -= offset;
+                    location.y -= offset;

                 else
                 else

-                    pos.x -= offset;
+                    location.x -= offset;

 
 

-                t->GetControl()->Move( pos );
+                t->GetControl()->Move( location );

                 break;
             }
             case wxTOOL_STYLE_SEPARATOR:
                 break;
             }
             case wxTOOL_STYLE_SEPARATOR:


@@ -567,9 +566,9 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
                                NULL );
 
                 if( isVertical )
                                NULL );
 
                 if( isVertical )

-                    y -= offset;
+                    y = (Dimension)(y - offset);

                 else
                 else

-                    x -= offset;
+                    x = (Dimension)(x - offset);

 
                 XtVaSetValues( t->GetButtonWidget(),
                                XmNx, x,
 
                 XtVaSetValues( t->GetButtonWidget(),
                                XmNx, x,


@@ -625,12 +624,12 @@ void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
 
     wxToolBarBase::DoSetSize(x, y, width, height, sizeFlags);
     }
 
     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 )
     {
     // 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() )
         // we have a frame that is not being deleted.
         wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
         if ( frame && !frame->IsBeingDeleted() )


@@ -758,7 +757,7 @@ void wxToolBarTimer::Notify()
 
         // Move the tooltip more or less above the button
         int yOffset = 20; // TODO: What should be really?
 
         // 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;
 
         /************************************************************/
         if (y < yOffset) y = 0;
 
         /************************************************************/


@@ -790,4 +789,3 @@ void wxToolBarTimer::Notify()
         /************************************************************/
         XtPopup (help_popup, XtGrabNone);
 }
         /************************************************************/
         XtPopup (help_popup, XtGrabNone);
 }

-