From: Vadim Zeitlin Date: Sat, 2 Jul 2011 10:29:14 +0000 (+0000) Subject: No real changes, just remove trailing commas from enum. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bbd783e0b2ff5308e235a572680c2ec52e191f6d?ds=sidebyside No real changes, just remove trailing commas from enum. wxCompositionMode enum had a trailing comma not allowed by C++ 98 (and which would result in warnings or errors with g++ pedantic switch). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 2581044d67..0d472b5bca 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -65,7 +65,7 @@ enum wxCompositionMode wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */ // mathematical compositions - wxCOMPOSITION_ADD, /* R = S + D */ + wxCOMPOSITION_ADD /* R = S + D */ }; class WXDLLIMPEXP_FWD_CORE wxWindowDC; diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index f43a420e9e..2874f6cade 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -262,7 +262,7 @@ enum wxCompositionMode wxCOMPOSITION_DEST_OUT, /**< @e R = @e D*(1 - @e Sa) */ wxCOMPOSITION_DEST_ATOP, /**< @e R = @e S*(1 - @e Da) + @e D*@e Sa */ wxCOMPOSITION_XOR, /**< @e R = @e S*(1 - @e Da) + @e D*(1 - @e Sa) */ - wxCOMPOSITION_ADD, /**< @e R = @e S + @e D */ + wxCOMPOSITION_ADD /**< @e R = @e S + @e D */ };