X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..730d336601a3ece761b56e7c05d1099352670a25:/src/msw/tglbtn.cpp?ds=inline diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp index 02f1fc0f42..6b91280e85 100644 --- a/src/msw/tglbtn.cpp +++ b/src/msw/tglbtn.cpp @@ -8,7 +8,7 @@ // Created: 08.02.01 // RCS-ID: $Id$ // Copyright: (c) 2000 Johnny C. Norris II -// License: Rocketeer license +// License: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -63,7 +63,7 @@ bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) event.SetInt(GetValue()); event.SetEventObject(this); ProcessCommand(event); - return TRUE; + return true; } // Single check box item @@ -75,12 +75,12 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, const wxString& name) { if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; - + return false; + if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) ) - return FALSE; - - return TRUE; + return false; + + return true; } wxBorder wxToggleButton::GetDefaultBorder() const @@ -117,7 +117,7 @@ wxSize wxToggleButton::DoGetBestSize() const GetTextExtent(label, &wBtn, NULL); int wChar, hChar; - wxGetCharSize(GetHWND(), &wChar, &hChar, &GetFont()); + wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont()); // add a margin - the button is wider than just its label wBtn += 3*wChar; @@ -140,7 +140,7 @@ wxSize wxToggleButton::DoGetBestSize() const void wxToggleButton::SetValue(bool val) { - SendMessage(GetHwnd(), BM_SETCHECK, val, 0); + ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0); } #ifndef BST_CHECKED @@ -150,9 +150,9 @@ void wxToggleButton::SetValue(bool val) bool wxToggleButton::GetValue() const { #ifdef __WIN32__ - return (SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED); + return (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED); #else - return ((0x001 & SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x001); + return ((0x001 & ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x001); #endif }