X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ed460c2e7802793d591c84f3cfdbff159c5549..0c77152e0de4e3851ee74e91e19c1394a28eb943:/src/msw/button.cpp diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 79f81ffaaa..fce544bd25 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/button.h" +#include "wx/brush.h" #endif #include "wx/msw/private.h" @@ -117,7 +118,8 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags) int cyf; char buf[300]; GetWindowText((HWND) GetHWND(), buf, 300); - GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL,& GetFont()); + GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL, + & this->GetFont()); // If we're prepared to use the existing width, then... if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH)) @@ -126,7 +128,7 @@ void wxButton::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 + 3*cx) ; }