Allow using wxDEFAULT as font size in wxOSX.

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

diff --git a/include/wx/msw/private/textmeasure.h b/include/wx/msw/private/textmeasure.h
index 2651a600ec17e1f52d1698d3b653f9ee4a3228c8..e317510ffe745c337a1295569ff899eff415f943 100644 (file)
--- a/include/wx/msw/private/textmeasure.h
+++ b/include/wx/msw/private/textmeasure.h
@@ -3,6 +3,7 @@
 // Purpose:     wxMSW-specific declaration of wxTextMeasure class
 // Author:      Manuel Martin
 // Created:     2012-10-05
 // Purpose:     wxMSW-specific declaration of wxTextMeasure class
 // Author:      Manuel Martin
 // Created:     2012-10-05

+// RCS-ID:      $Id:

 // Copyright:   (c) 1997-2012 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997-2012 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -19,12 +20,13 @@
 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();