Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

64 bit fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-10 20:19:30 +00:00
parent ba5872682c
commit 5bf565977f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/cocoa/toolbar.mm
View File

@@ -348,7 +348,11 @@ private:
- (NSToolbarItem*) toolbar:(NSToolbar*) toolbar itemForItemIdentifier:(NSString*) itemIdentifier willBeInsertedIntoToolbar:(BOOL) flag - (NSToolbarItem*) toolbar:(NSToolbar*) toolbar itemForItemIdentifier:(NSString*) itemIdentifier willBeInsertedIntoToolbar:(BOOL) flag
{ {
#ifdef __LP64__
wxToolBarTool* tool = (wxToolBarTool*) [itemIdentifier longLongValue];
#else
wxToolBarTool* tool = (wxToolBarTool*) [itemIdentifier intValue]; wxToolBarTool* tool = (wxToolBarTool*) [itemIdentifier intValue];
#endif
if ( tool ) if ( tool )
{ {
wxNSToolbarItem* item = (wxNSToolbarItem*) tool->GetToolbarItemRef(); wxNSToolbarItem* item = (wxNSToolbarItem*) tool->GetToolbarItemRef();
@@ -943,7 +947,7 @@ bool wxToolBar::Realize()
} }
} }
} }
wxString identifier = wxString::Format( wxT("%d"), (int) tool ); wxString identifier = wxString::Format( wxT("%ld"), (long) tool );
wxCFStringRef cfidentifier(identifier); wxCFStringRef cfidentifier(identifier);
[refTB insertItemWithItemIdentifier:cfidentifier.AsNSString() atIndex:currentPosition]; [refTB insertItemWithItemIdentifier:cfidentifier.AsNSString() atIndex:currentPosition];
@@ -1225,7 +1229,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR
if (m_macToolbar != NULL) if (m_macToolbar != NULL)
{ {
wxString identifier = wxString::Format(wxT("%d"), (int) tool); wxString identifier = wxString::Format(wxT("%ld"), (long) tool);
wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() ); wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() );
wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ]; wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ];
[item setImplementation:tool]; [item setImplementation:tool];
@@ -1256,7 +1260,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
WXWidget view = (WXWidget) tool->GetControl()->GetHandle() ; WXWidget view = (WXWidget) tool->GetControl()->GetHandle() ;
wxCHECK_MSG( view, false, _T("control must be non-NULL") ); wxCHECK_MSG( view, false, _T("control must be non-NULL") );
wxString identifier = wxString::Format(wxT("%d"), (int) tool); wxString identifier = wxString::Format(wxT("%ld"), (long) tool);
wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() ); wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() );
wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ]; wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ];
[item setImplementation:tool]; [item setImplementation:tool];

2
src/osx/cocoa/window.mm
View File

@@ -324,7 +324,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
wxRegion updateRgn; wxRegion updateRgn;
const NSRect *rects; const NSRect *rects;
int count ; NSInteger count;
[self getRectsBeingDrawn:&rects count:&count]; [self getRectsBeingDrawn:&rects count:&count];
for ( int i = 0 ; i < count ; ++i ) for ( int i = 0 ; i < count ; ++i )