aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-05-26 09:24:38 +1000
committernyamatongwe <devnull@localhost>2011-05-26 09:24:38 +1000
commitfc4fa67c768ae1222877e936b9365378fd3a217f (patch)
tree0078d8ce08ec52c480c09ac5c7573de9716c2a4a
parentbeda5d7ebfb1bcd0fdc13155bdb66fcbf09aecb8 (diff)
downloadscintilla-mirror-fc4fa67c768ae1222877e936b9365378fd3a217f.tar.gz
List box doesn't work on Cocoa and stops 64-bit building so disable its code
-rw-r--r--cocoa/PlatCocoa.mm10
1 files changed, 10 insertions, 0 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 3a70fcd93..24c74c70e 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -1382,6 +1382,9 @@ void ListBoxImpl::DrawRow(DataBrowserItemID item,
DataBrowserItemState itemState,
const Rect *theRect)
{
+// ListBox does not work on Cocoa
+// Just make compile for now
+#if 0
Rect row = *theRect;
row.left = 0;
@@ -1441,6 +1444,7 @@ void ListBoxImpl::DrawRow(DataBrowserItemID item,
QDEndCGContext( port, &cgContext );
delete surfaceItem;
}
+#endif
}
@@ -1525,6 +1529,9 @@ void ListBoxImpl::InstallDataBrowserCustomCallbacks()
}
void ListBoxImpl::SetFont(Font &font_) {
+// ListBox does not work on Cocoa
+// Just make compile for now
+#if 0
// Having to do this conversion is LAME
QuartzTextStyle *ts = reinterpret_cast<QuartzTextStyle*>( font_.GetID() );
ControlFontStyleRec style;
@@ -1554,6 +1561,9 @@ void ListBoxImpl::SetFont(Font &font_) {
::CFStringGetCString( fontNameCF, fontName, (CFIndex)255, kCFStringEncodingMacRoman );
font.Create((const char *)fontName, 0, style.size, false, false);
+#else
+ font.Create("Monaco", 0, 10, false, false);
+#endif
}
void ListBoxImpl::SetAverageCharWidth(int width) {