Add missing wxUSE_OLE checks to safearray.cpp.

[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 ad9a43c24d3b34d14bc4eb418cf256378ace4b6e..d32466f287e4ebb749c85a640f7a8113f0e91269 100644 (file)
--- a/include/wx/gtk/private/textmeasure.h
+++ b/include/wx/gtk/private/textmeasure.h
@@ -2,7 +2,8 @@
 // Name:        wx/gtk/private/textmeasure.h
 // Purpose:     wxGTK-specific declaration of wxTextMeasure class
 // Author:      Manuel Martin
-// Created:     2012-19-05
+// Created:     2012-10-05
+// RCS-ID:      $Id:
 // Copyright:   (c) 1997-2012 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,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();
@@ -48,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