X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c085e333984dc079a001cd3f581aeb1f51a1f227..9a6be59a80461adb9e7c4bc7754d6a0b1a8c708d:/src/msw/stattext.cpp?ds=sidebyside diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index e27866942b..47638caa1b 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -21,7 +21,9 @@ #endif #ifndef WX_PRECOMP +#include "wx/event.h" #include "wx/app.h" +#include "wx/brush.h" #endif #include "wx/stattext.h" @@ -86,7 +88,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, SubclassWin(m_hWnd); - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); SetSize(x, y, width, height); return TRUE; @@ -114,7 +116,7 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags) int cyf; ::GetWindowText((HWND) GetHWND(), buf, 300); - GetTextExtent(buf, ¤t_width, &cyf, NULL, NULL,GetFont()); + GetTextExtent(buf, ¤t_width, &cyf, NULL, NULL, & this->GetFont()); int ww, hh; GetSize(&ww, &hh); @@ -126,7 +128,7 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags) { int cx; int cy; - wxGetCharSize(GetHWND(), &cx, &cy,GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); actualWidth = (int)(current_width + cx) ; } @@ -159,7 +161,7 @@ void wxStaticText::SetLabel(const wxString& label) ::ScreenToClient((HWND) parent->GetHWND(), &point); } - GetTextExtent(label, &w, &h, NULL, NULL, GetFont()); + GetTextExtent(label, &w, &h, NULL, NULL, & this->GetFont()); MoveWindow((HWND) GetHWND(), point.x, point.y, (int)(w + 10), (int)h, TRUE); SetWindowText((HWND) GetHWND(), (const char *)label);