Allow creating wxTextMeasure without specifying the font.

Use the default window/DC font by default as this is the most common case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/private/textmeasure.h b/include/wx/generic/private/textmeasure.h
index 5d44f353505a1f03704dc52bd0192d44800f1155..c3ab30da708844c8637b9fda5d6b2a19d9c8f513 100644 (file)
--- a/include/wx/generic/private/textmeasure.h
+++ b/include/wx/generic/private/textmeasure.h
@@ -18,9 +18,9 @@
 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) {}
         : wxTextMeasureBase(dc, font) {}

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

         : wxTextMeasureBase(win, font) {}
 
 protected:
         : wxTextMeasureBase(win, font) {}
 
 protected:

diff --git a/include/wx/gtk/private/textmeasure.h b/include/wx/gtk/private/textmeasure.h
index 5027be7b3539ef29aaee92a5d75a18f275d58379..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();

diff --git a/include/wx/msw/private/textmeasure.h b/include/wx/msw/private/textmeasure.h
index a52deb59a17d041c9a105a7c858217436cd1bff8..e317510ffe745c337a1295569ff899eff415f943 100644 (file)
--- a/include/wx/msw/private/textmeasure.h
+++ b/include/wx/msw/private/textmeasure.h
@@ -20,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();