5 files changed, 9 insertions, 5 deletions
diff --git a/src/Fl_Bitmap.cxx b/src/Fl_Bitmap.cxx
index 48f6ac3df..3995c0773 100644
--- a/src/Fl_Bitmap.cxx
+++ b/src/Fl_Bitmap.cxx
@@ -352,7 +352,7 @@ Fl_Bitmap::~Fl_Bitmap() {
 
 void Fl_Bitmap::uncache() {
   if (id_) {
-#ifdef __APPLE_COCOA__
+#ifdef __APPLE_QUARTZ__
     fl_delete_bitmask((Fl_Bitmask)id_);
 #else
     fl_delete_bitmask((Fl_Offscreen)id_);
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index d25a443d0..adc3fa094 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -111,6 +111,8 @@ void Fl_Window::draw() {
   draw_children();
 
 #ifdef __APPLE_QUARTZ__
+  // on OS X, windows have no frame. To resize a window, we drag the lower right
+  // corner. This code draws a little ribbed triangle for dragging.
   extern CGContextRef fl_gc;
   if (fl_gc && !parent() && resizable() && (!size_range_set || minh!=maxh || minw!=maxw)) {
     int dx = Fl::box_dw(box())-Fl::box_dx(box());
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 630c7cec2..d435bf82b 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -350,9 +350,11 @@ void fl_draw(
 {
   if ((!str || !*str) && !img) return;
   if (w && h && !fl_not_clipped(x, y, w, h) && (align & FL_ALIGN_INSIDE)) return;
-  if (align & FL_ALIGN_CLIP) fl_push_clip(x, y, w, h);
+  if (align & FL_ALIGN_CLIP) 
+    fl_push_clip(x, y, w, h);
   fl_draw(str, x, y, w, h, align, fl_draw, img, draw_symbols);
-  if (align & FL_ALIGN_CLIP) fl_pop_clip();
+  if (align & FL_ALIGN_CLIP) 
+    fl_pop_clip();
 }
 
 /**
diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx
index 1832edb8c..92fd58055 100644
--- a/src/fl_font_mac.cxx
+++ b/src/fl_font_mac.cxx
@@ -403,7 +403,7 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) {
 void fl_draw(const char *str, int n, float x, float y);
 
 void Fl_Device::draw(const char* str, int n, int x, int y) {
-  fl_draw(str, n, (float)x-0.0f, (float)y-0.5f);
+  fl_draw(str, n, (float)x-0.0f, (float)y+0.5f);
 }
 
 
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index fed8feed3..8bae9b51d 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -132,7 +132,7 @@ void  gl_font(int fontid, int size) {
 
   }
   gl_fontsize = fl_fontsize;
-#ifndef __APPLE_COCOA__
+#ifndef __APPLE_QUARTZ__
   glListBase(fl_fontsize->listbase);
 #endif
 }