Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow creating wxTextMeasure without specifying the font.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-11-01 17:15:22 +00:00
parent d78aa51b17
commit c94c3a77b8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/private/textmeasure.h
View File

@@ -18,9 +18,9 @@
class wxTextMeasure : public wxTextMeasureBase class wxTextMeasure : public wxTextMeasureBase
{ {
public: 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) {} : wxTextMeasureBase(win, font) {}
protected: protected:

4
include/wx/gtk/private/textmeasure.h
View File

@@ -20,13 +20,13 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl;
class wxTextMeasure : public wxTextMeasureBase class wxTextMeasure : public wxTextMeasureBase
{ {
public: public:
wxTextMeasure(const wxDC *dc, const wxFont *font) wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
: wxTextMeasureBase(dc, font) : wxTextMeasureBase(dc, font)
{ {
Init(); Init();
} }
wxTextMeasure(const wxWindow *win, const wxFont *font) wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
: wxTextMeasureBase(win, font) : wxTextMeasureBase(win, font)
{ {
Init(); Init();

5
include/wx/msw/private/textmeasure.h
View File

@@ -20,12 +20,13 @@
class wxTextMeasure : public wxTextMeasureBase class wxTextMeasure : public wxTextMeasureBase
{ {
public: public:
wxTextMeasure(const wxDC *dc, const wxFont *font) wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
: wxTextMeasureBase(dc, font) : wxTextMeasureBase(dc, font)
{ {
Init(); Init();
} }
wxTextMeasure(const wxWindow *win, const wxFont *font)
wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
: wxTextMeasureBase(win, font) : wxTextMeasureBase(win, font)
{ {
Init(); Init();