Make wxLoadUserResource() declaration available to wxBase too.

[wxWidgets.git] / include / wx / osx / metafile.h

diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 4421a565bf56d8939e1ebd907b46a1e7139471f0..0014dcc7ae7857cd1803adc6b395b6c226175492 100644 (file)
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -22,7 +22,7 @@
 #include "wx/dataobj.h"
 #endif
 
-#include "wx/osx/carbon/dcclient.h"
+#include "wx/osx/dcclient.h"
 
 /*
  * Metafile and metafile device context classes
@@ -95,7 +95,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
@@ -117,7 +117,7 @@ class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
 
 private:
     DECLARE_CLASS(wxMetafileDC)
-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
 
@@ -133,7 +133,7 @@ private:
 bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent
-bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
+bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true);
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data