Added AppKit framework for MACOSX

Refactored to allow Cairo but no TK builds

Author: highperformancecoder

Makefile

@@ -73,6 +73,7 @@ endif
 ifdef MAC_OSX_TK
 CXXFLAGS+=-DMAC_OSX_TK 
 OBJS+=src/getContext.o
+LIBS+=-framework AppKit
 endif
 
 CDHDRS=ref.cd random.cd random_basic.cd TCL_obj_base.cd RESTProcess_base.cd signature.cd netcomplexity.cd graph.cd cachedDBM.cd sparse_mat.cd analysis.cd analysisBLT.cd analysisCairo.cd plot.cd cairoSurfaceImage.cd polyRESTProcess.cd

include/cairoSurfaceImage.h

@@ -8,7 +8,7 @@
 
 #ifndef CAIROSURFACEIMAGE_H
 #define CAIROSURFACEIMAGE_H
-#if defined(CAIRO) && defined(TK)
+#if defined(CAIRO)
 #include "cairo_base.h"
 
 namespace ecolab

include/cairo_base.h

@@ -168,6 +168,26 @@ namespace ecolab
     typedef std::tr1::shared_ptr<Surface> SurfacePtr;
 #endif
 
+    /// RAII object wrapping a cairo_path_t, along with its transformation
+    class Path
+    {
+      cairo_path_t* m_path;
+      cairo_matrix_t m_transformation;
+      Path(const Path&);
+      void operator=(const Path&);
+    public:
+      Path(cairo_t* cairo): m_path(cairo_copy_path(cairo))
+      {cairo_get_matrix(cairo, &m_transformation);}
+      ~Path() {cairo_path_destroy(m_path);}
+      void appendToCurrent(cairo_t* cairo) {
+        // apply saved transformation along with path
+        cairo_save(cairo);
+        cairo_set_matrix(cairo,&m_transformation);
+        cairo_append_path(cairo,m_path);
+        cairo_restore(cairo);
+      }
+    };
+
 #ifdef TK
     struct PhotoImageBlock: public Tk_PhotoImageBlock
     {
@@ -319,27 +339,6 @@ namespace ecolab
 
     };
 
-    /// RAII object wrapping a cairo_path_t, along with its transformation
-    class Path
-    {
-      cairo_path_t* m_path;
-      cairo_matrix_t m_transformation;
-      Path(const Path&);
-      void operator=(const Path&);
-    public:
-      Path(cairo_t* cairo): m_path(cairo_copy_path(cairo))
-      {cairo_get_matrix(cairo, &m_transformation);}
-      ~Path() {cairo_path_destroy(m_path);}
-      void appendToCurrent(cairo_t* cairo) {
-        // apply saved transformation along with path
-        cairo_save(cairo);
-        cairo_set_matrix(cairo,&m_transformation);
-        cairo_append_path(cairo,m_path);
-        cairo_restore(cairo);
-      }
-    };
-
-    
     /// internal structure used for Tk Canvas cairo image items
     struct ImageItem  {
       Tk_Item header;		/* Generic stuff that's the same for all

src/cairoSurfaceImage.cc

@@ -6,9 +6,8 @@
   Open source licensed under the MIT license. See LICENSE for details.
 */
 
-#if defined(CAIRO) && defined(TK)
+#ifdef CAIRO
 #include "cairoSurfaceImage.h"
-#include "tcl++.h"
 #include "pango.h"
 
 #include "ecolab_epilogue.h"
@@ -20,12 +19,19 @@
 #include <cairo/cairo-pdf.h>
 #include <cairo/cairo-svg.h>
 
+using namespace ecolab;
+using namespace std;
+
+#ifdef TK
+#include "tcl++.h"
+
 #ifdef _WIN32
 #undef Realloc
 #include <windows.h>
 #include <wingdi.h>
 #ifdef USE_WIN32_SURFACE
 #include <cairo/cairo-win32.h>
+
 // undocumented internal function for extracting the HDC from a Drawable
 extern "C" HDC TkWinGetDrawableDC(Display*, Drawable, void*);
 extern "C" HDC TkWinReleaseDrawableDC(Drawable, HDC, void*);
@@ -47,9 +53,6 @@ extern "C" HDC TkWinReleaseDrawableDC(Drawable, HDC, void*);
 #define CONST86
 #endif
 
-using namespace ecolab;
-using namespace std;
-
 namespace
 {
     struct TkWinSurface: public ecolab::cairo::Surface
@@ -193,11 +196,14 @@ namespace
 
 }
 
+#endif // TK
 void CairoSurface::registerImage()
 {
+#ifdef TK
   // ensure Tk_Init is called.
   if (!Tk_MainWindow(interp())) Tk_Init(interp());
   Tk_CreateImageType(&canvasImage);
+#endif
 }
 
 cairo::SurfacePtr CairoSurface::vectorRender(const char* filename, cairo_surface_t* (*s)(const char *,double,double))
@@ -293,4 +299,4 @@ void CairoSurface::renderToEMF(const string& filename)
 
 #endif
 
-#endif
+#endif //CAIRO

src/cairo_base.cc

@@ -12,8 +12,9 @@
 #include "ecolab_epilogue.h"
 
 const char *ecolab::Pango::defaultFamily=NULL;
+double ecolab::Pango::scaleFactor=1;
 
-#if defined(CAIRO) && defined(TK)
+#if defined(CAIRO)
 
 #if CAIRO_VERSION_MAJOR <= 1 && CAIRO_VERSION_MINOR < 10
 //#error "Cairo 1.10.x minimum required"
@@ -22,6 +23,7 @@ bool cairo_in_clip(cairo_t*,double,double) {return true;}
 #endif
 
 using namespace std;
+#if defined(TK)
 
 namespace
 {
@@ -90,7 +92,6 @@ namespace
 
 namespace ecolab
 {
-  double Pango::scaleFactor=1;
 
   namespace cairo
   {
@@ -136,7 +137,7 @@ namespace ecolab
       else
         throw error("image %s not found", imgName.c_str());
     }
-
+    
    double CairoImage::distanceFrom(double x, double y) const
     {
       if (cairoSurface)
@@ -225,4 +226,5 @@ namespace ecolab
   }
 }
 
-#endif
+#endif // TK
+#endif // CAIRO