X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c70155b8ee6cdf24966de6bf24370b0454a045ab..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/gtk/private/textmeasure.h diff --git a/include/wx/gtk/private/textmeasure.h b/include/wx/gtk/private/textmeasure.h index c7fc712ea7..d32466f287 100644 --- a/include/wx/gtk/private/textmeasure.h +++ b/include/wx/gtk/private/textmeasure.h @@ -20,13 +20,13 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl; class wxTextMeasure : public wxTextMeasureBase { public: - wxTextMeasure(const wxDC *dc, const wxFont *font) + wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL) : wxTextMeasureBase(dc, font) { Init(); } - wxTextMeasure(const wxWindow *win, const wxFont *font) + wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL) : wxTextMeasureBase(win, font) { Init(); @@ -49,7 +49,6 @@ protected: wxArrayInt& widths, double scaleX); - // This class is only used for DC text measuring with GTK+ 2 as GTK+ 3 uses // Cairo and not Pango for this. However it's still used even with GTK+ 3 // for window text measuring, so the context and the layout are still