X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc964c0d23a70f81378efec8b49912624560fac3..dc484d491b15355285a89da275c58c2ef247d1f4:/include/wx/mac/carbon/private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index dc3f101780..1990703794 100644
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -785,14 +785,14 @@ protected :
         Boolean changeValue ) = 0;
 
     static pascal Boolean DataBrowserCompareProc(
-	    ControlRef browser,
-	    DataBrowserItemID itemOneID,
-	    DataBrowserItemID itemTwoID,
-	    DataBrowserPropertyID sortProperty);
-
-	virtual Boolean CompareItems(DataBrowserItemID itemOneID,
-	    DataBrowserItemID itemTwoID,
-	    DataBrowserPropertyID sortProperty) = 0;
+        ControlRef browser,
+        DataBrowserItemID itemOneID,
+        DataBrowserItemID itemTwoID,
+        DataBrowserPropertyID sortProperty);
+
+    virtual Boolean CompareItems(DataBrowserItemID itemOneID,
+        DataBrowserItemID itemTwoID,
+        DataBrowserPropertyID sortProperty) = 0;
 };
 
 // ============================================================================
@@ -1080,7 +1080,7 @@ public:
 // graphics implementation
 // ============================================================================
 
-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT
 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {
@@ -1168,13 +1168,13 @@ void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-
     friend class WXDLLEXPORT wxIcon;
     friend class WXDLLEXPORT wxCursor;
 public:
     wxBitmapRefData(int width , int height , int depth);
     wxBitmapRefData();
+    wxBitmapRefData(const wxBitmapRefData &tocopy);
+
     virtual ~wxBitmapRefData();
 
     void Free();