Author: mlytwyn
Date: Mon Dec 12 17:19:06 2016
New Revision: 40259
URL: http://svn.gna.org/viewcvs/gnustep?rev=40259&view=rev
Log:
Toolbar multiple item issue on 64 bit - issue 11644
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSToolbarView.h
libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
libs/gui/branches/gnustep_testplant_branch/Source/NSToolbar.m
libs/gui/branches/gnustep_testplant_branch/Source/NSToolbarFrameworkPrivate.h
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSToolbarView.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSToolbarView.h?rev=40259&r1=40258&r2=40259&view=diff
==============================================================================
---
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSToolbarView.h
(original)
+++
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSToolbarView.h
Mon Dec 12 17:19:06 2016
@@ -60,8 +60,8 @@
float _heightFromLayout;
}
-+ (int) draggedItemIndex;
-+ (void) setDraggedItemIndex:(int)sourceIndex;
++ (NSInteger) draggedItemIndex;
++ (void) setDraggedItemIndex:(NSInteger)sourceIndex;
- (id) initWithFrame: (NSRect)frame;
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m?rev=40259&r1=40258&r2=40259&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m Mon Dec
12 17:19:06 2016
@@ -208,6 +208,7 @@
{
if (self == [GSToolbarView class])
{
+ [self setVersion: current_version];
}
}
@@ -254,12 +255,12 @@
// Dragging related methods
-+ (int) draggedItemIndex
++ (NSInteger) draggedItemIndex
{
return draggedItemIndex;
}
-+ (void) setDraggedItemIndex:(int)sourceIndex
++ (void) setDraggedItemIndex:(NSInteger)sourceIndex
{
draggedItemIndex = sourceIndex;
}
@@ -302,7 +303,7 @@
itemRect = [[visibleBackViews objectAtIndex:index] frame];
if (location.x < (itemRect.origin.x + (itemRect.size.width/2)))
{
- NSLog(@"To the LEFT of %d", index);
+ //NSLog(@"To the LEFT of %d", index);
return index;
}
}
@@ -315,7 +316,7 @@
itemRect = [[visibleBackViews objectAtIndex:index] frame];
if (location.x > (itemRect.origin.x + (itemRect.size.width/2)))
{
- NSLog(@"To the RIGHT of %d", index);
+ //NSLog(@"To the RIGHT of %d", index);
return index;
}
}
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSToolbar.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSToolbar.m?rev=40259&r1=40258&r2=40259&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSToolbar.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSToolbar.m Mon Dec
12 17:19:06 2016
@@ -1269,7 +1269,7 @@
}
- (void) _insertItemWithItemIdentifier: (NSString *)itemIdentifier
- atIndex: (int)index
+ atIndex: (NSInteger)index
broadcast: (BOOL)broadcast
{
NSToolbarItem *item = nil;
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSToolbarFrameworkPrivate.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSToolbarFrameworkPrivate.h?rev=40259&r1=40258&r2=40259&view=diff
==============================================================================
---
libs/gui/branches/gnustep_testplant_branch/Source/NSToolbarFrameworkPrivate.h
(original)
+++
libs/gui/branches/gnustep_testplant_branch/Source/NSToolbarFrameworkPrivate.h
Mon Dec 12 17:19:06 2016
@@ -70,7 +70,7 @@
// Private methods with broadcast support
- (void) _insertItemWithItemIdentifier: (NSString *)itemIdentifier
- atIndex: (int)index
+ atIndex: (NSInteger)index
broadcast: (BOOL)broadcast;
- (void) _removeItemAtIndex: (int)index broadcast: (BOOL)broadcast;
- (void) _setAllowsUserCustomization: (BOOL)flag broadcast: (BOOL)broadcast;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
