From 2fd999f81ee39cf0a5579f54418e651937ddec1a Mon Sep 17 00:00:00 2001 From: Samuel Dunn Date: Fri, 23 Jun 2017 18:47:43 -0700 Subject: [PATCH] Remove wxPNG_TYPE* enums from interface/wx/imagpng.h --- interface/wx/imagpng.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/wx/imagpng.h b/interface/wx/imagpng.h index b4e6e70eaf..789732cf02 100644 --- a/interface/wx/imagpng.h +++ b/interface/wx/imagpng.h @@ -13,7 +13,9 @@ #define wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY wxT("PngZS") #define wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE wxT("PngZB") - +/* These are already in interface/wx/image.h + They were likely put there as a stopgap, but they've been there long enough + that that location trumps moving them here. enum { wxPNG_TYPE_COLOUR = 0, @@ -21,6 +23,7 @@ enum wxPNG_TYPE_GREY_RED = 3, wxPNG_TYPE_PALETTE = 4 }; +*/ /** @class wxPNGHandler