64 bit fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 674971e1a10de1670552e78a8776a5af509ad6ac..1b8b4866fe4bafcc1fa7379794f912e8bb0391c3 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -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 )
     {
         wxNSToolbarItem* item = (wxNSToolbarItem*) tool->GetToolbarItemRef();
     if ( tool )
     {
         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);
 
                     [refTB insertItemWithItemIdentifier:cfidentifier.AsNSString() atIndex:currentPosition];
                     wxCFStringRef cfidentifier(identifier);
 
                     [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 (m_macToolbar != NULL)
                 {
 #if wxOSX_USE_NATIVE_TOOLBAR
                 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() );
                     wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ];
                     [item setImplementation:tool];
                     wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() );
                     wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ];
                     [item setImplementation:tool];


@@ -1256,7 +1260,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 WXWidget view = (WXWidget) tool->GetControl()->GetHandle() ;
                 wxCHECK_MSG( view, false, _T("control must be non-NULL") );
 
                 WXWidget view = (WXWidget) tool->GetControl()->GetHandle() ;
                 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() );
                 wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ];
                 [item setImplementation:tool];
                 wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() );
                 wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ];
                 [item setImplementation:tool];

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index df977ab28178a8b9ca6446083c04b660208e7188..561270d96a63feb0cc1af0f32e97565bdc78274b 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -324,7 +324,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
         
         wxRegion updateRgn;
         const NSRect *rects;
         
         wxRegion updateRgn;
         const NSRect *rects;

-        int count ;
+        NSInteger count;

 
         [self getRectsBeingDrawn:&rects count:&count];
         for ( int i = 0 ; i < count ; ++i )
 
         [self getRectsBeingDrawn:&rects count:&count];
         for ( int i = 0 ; i < count ; ++i )