activating DrawRectangle optimization

[wxWidgets.git] / include / wx / gtk / private / textmeasure.h

diff --git a/include/wx/gtk/private/textmeasure.h b/include/wx/gtk/private/textmeasure.h
index c7fc712ea7303ee65fa102eee6cba372ffec44ce..d32466f287e4ebb749c85a640f7a8113f0e91269 100644 (file)
--- 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:
 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();
     }
 
         : wxTextMeasureBase(dc, font)
     {
         Init();
     }
 

-    wxTextMeasure(const wxWindow *win, const wxFont *font)
+    wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)

         : wxTextMeasureBase(win, font)
     {
         Init();
         : wxTextMeasureBase(win, font)
     {
         Init();


@@ -49,7 +49,6 @@ protected:
                                          wxArrayInt& widths,
                                          double scaleX);
 
                                          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
     // 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