X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f686c274a264e89ea97505350a82c1134f307..054d497f280187c599a6826d950090f72dccdc41:/src/msw/choice.cpp diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 9688accf39..d36ce7fe08 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/choice.h" +#include "wx/utils.h" #endif #include "wx/msw/private.h" @@ -105,7 +106,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); int i; for (i = 0; i < n; i++) @@ -204,7 +205,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) int cx; // button font dimensions int cy; - wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, & GetFont()); int control_width, control_height; @@ -232,7 +233,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) for (i = 0; i < m_noStrings; i++) { wxString str(GetString(i)); - GetTextExtent(str, &len, &ht, NULL, NULL,GetFont()); + GetTextExtent(str, &len, &ht, NULL, NULL, & GetFont()); if ( len > longest) longest = len; }