diff options
| author | nyamatongwe <devnull@localhost> | 2011-05-21 11:52:08 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-05-21 11:52:08 +1000 |
| commit | 47dd6f2e276c96d48276c74badb04a1edf68eb0b (patch) | |
| tree | 7993bc4ea442054d793510285d0011323192c7d6 | |
| parent | 33bf1af7b71e313a380559b0bbd59e86eef9331b (diff) | |
| download | scintilla-mirror-47dd6f2e276c96d48276c74badb04a1edf68eb0b.tar.gz | |
64-bit fixes.
| -rw-r--r-- | cocoa/InfoBar.mm | 2 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 6 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm index 63d68c4a1..0d4a7a750 100644 --- a/cocoa/InfoBar.mm +++ b/cocoa/InfoBar.mm @@ -46,7 +46,7 @@ //-------------------------------------------------------------------------------------------------- - (void) selectWithFrame: (NSRect) aRect inView: (NSView*) controlView editor: (NSText*) textObj - delegate:(id) anObject start: (int) selStart length: (int) selLength + delegate:(id) anObject start: (NSInteger) selStart length: (NSInteger) selLength { aRect = [self drawingRectForBounds: aRect]; mIsEditingOrSelecting = YES; diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 7dfb60169..6e8620b0b 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -542,7 +542,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) // Unlike the documentation, you MUST pass in a "components" parameter: // For coloured patterns it is the alpha value. - const float alpha = 1.0; + const CGFloat alpha = 1.0; CGContextSetFillPattern( gc, pattern, &alpha ); CGContextFillRect( gc, PRectangleToCGRect( rc ) ); CGContextRestoreGState( gc ); @@ -1475,7 +1475,7 @@ void ListBoxImpl::DrawRow(DataBrowserItemID item, ColourPair fore; if (itemState == kDataBrowserItemIsSelected) { - long systemVersion; + SInt32 systemVersion; Gestalt( gestaltSystemVersion, &systemVersion ); // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting if ( (systemVersion >= 0x00001030) )//&& (IsControlActive( lb ) == false) ) @@ -1621,7 +1621,7 @@ void ListBoxImpl::SetFont(Font &font_) { ts->getAttribute( kATSUFontTag, sizeof(fontID), &fontID, NULL ); ATSUFontIDtoFOND(fontID, &style.font, NULL); ts->getAttribute( kATSUSizeTag, sizeof(Fixed), &value, NULL ); - style.size = ((SInt16)FixRound((SInt32)value)); + style.size = ((SInt16)FixRound((uintptr_t)value)); //SetControlFontStyle(lb, &style); #ifdef DB_TABLE_ROW_HEIGHT diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 08c827b38..434ab942d 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1178,7 +1178,7 @@ void ScintillaCocoa::NotifyParent(SCNotification scn) if (notifyProc != NULL) { scn.nmhdr.hwndFrom = (void*) this; - scn.nmhdr.idFrom = (unsigned int) wMain.GetID(); + scn.nmhdr.idFrom = (uintptr_t) wMain.GetID(); notifyProc(notifyObj, WM_NOTIFY, (uintptr_t) 0, (uintptr_t) &scn); } } |