use explicit virtual keyword with overridden virtual methods

[wxWidgets.git] / include / wx / mac / carbon / private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index f45168ed628fae69d99a86f6442a156adb0b86ee..50cdec1becc3bff06f5230da0253d7fcd1d0a7c7 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -64,7 +64,7 @@ inline int    FixedToInt( Fixed inFixed )
 }
 #endif
 
 }
 #endif
 

-#if MAC_OS_X_VERSION_MAX_REQUIRED < MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5

 typedef UInt32 URefCon;
 typedef SInt32 SRefCon;
 #endif
 typedef UInt32 URefCon;
 typedef SInt32 SRefCon;
 #endif


@@ -785,14 +785,14 @@ protected :
         Boolean changeValue ) = 0;
 
     static pascal Boolean DataBrowserCompareProc(
         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
 // ============================================================================
 
 // graphics implementation
 // ============================================================================
 

-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT

 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {
 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {