win32 build fixes

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ed281c..6409c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-11-14  Jonathon Jongsma  <jonathon@quotidian.org>
 
+	* cairomm/win32_surface.cc:
+	* cairomm/win32_surface.h: fix a bunch of compile errors in the win32 surface
+	as reported by Paul Goins <general vultaire.net>
+
+2008-11-14  Jonathon Jongsma  <jonathon@quotidian.org>
+
 	* configure.in: support the --with-boost=[boost_path] option for specifying
 	the install path of boost libraries
 
diff --git a/cairomm/win32_surface.cc b/cairomm/win32_surface.cc
index 2bd8c6d..f93feca 100644
--- a/cairomm/win32_surface.cc
+++ b/cairomm/win32_surface.cc
@@ -73,7 +73,7 @@ RefPtr<Win32Surface> Win32Surface::create_with_ddb(HDC hdc, Format format, int w
   return RefPtr<Win32Surface>(new Win32Surface(cobject, true /* has reference */));
 }
 
-Win32PrintingSurface::Win32PrintingSurface(cairo_surface_t* cobject, bool has_reference = false)
+Win32PrintingSurface::Win32PrintingSurface(cairo_surface_t* cobject, bool has_reference)
     : Surface(cobject, has_reference)
 {
 }
@@ -83,7 +83,7 @@ Win32PrintingSurface::~Win32PrintingSurface()
   // surface is destroyed in base class
 }
 
-static RefPtr<Win32PrintingSurface> Win32PrintingSurface::create(HDC hdc)
+RefPtr<Win32PrintingSurface> Win32PrintingSurface::create(HDC hdc)
 {
   cairo_surface_t* cobject = cairo_win32_surface_create(hdc);
   check_status_and_throw_exception(cairo_surface_status(cobject));
diff --git a/cairomm/win32_surface.h b/cairomm/win32_surface.h
index 51f0c4c..6184282 100644
--- a/cairomm/win32_surface.h
+++ b/cairomm/win32_surface.h
@@ -113,7 +113,7 @@ public:
    *
    * @since 1.8
    */
-  static RefPtr<Win32Surface> create_with_ddb(Format format, int width, int height);
+  static RefPtr<Win32Surface> create_with_ddb(HDC hdc, Format format, int width, int height);
 
 };
 
@@ -128,7 +128,7 @@ class Win32PrintingSurface : public Surface
 {
 public:
   explicit Win32PrintingSurface(cairo_surface_t* cobject, bool has_reference = false);
-  virtual ~Win32Surface();
+  virtual ~Win32PrintingSurface();
 
   /** Creates a cairo surface that targets the given DC. The DC will be queried
    * for its initial clip extents, and this will be used as the size of the