X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ed460c2e7802793d591c84f3cfdbff159c5549..d311155fa2c85587286ea271bd5c9546faf9aa90:/src/msw/radiobut.cpp diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index 32bd65e9b8..eb067a09a3 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -24,6 +24,7 @@ #include #include "wx/setup.h" #include "wx/radiobut.h" +#include "wx/brush.h" #endif #include "wx/msw/private.h" @@ -77,7 +78,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, groupStyle = WS_GROUP; // long msStyle = groupStyle | RADIO_FLAGS; - long msStyle = groupStyle | BS_RADIOBUTTON | WS_CHILD | WS_VISIBLE ; + long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ; bool want3D; WXDWORD exStyle = Determine3DEffects(0, &want3D) ; @@ -114,7 +115,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, if (label != "") { int label_width, label_height; - GetTextExtent(label, &label_width, &label_height, NULL, NULL, & GetFont()); + GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont()); if (width < 0) width = (int)(label_width + RADIO_SIZE); if (height<0) @@ -150,10 +151,10 @@ void wxRadioButton::SetValue(bool value) SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L); } -// Get single selection, for single choice list items +// Get single selection bool wxRadioButton::GetValue(void) const { - return (SendMessage((HWND) GetHWND(), BM_SETCHECK, 0, 0L) != 0); + return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L) != 0); } WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,