document that the workaround used to make popup menus behave correctly is the one...

[wxWidgets.git] / src / msw / tglbtn.cpp

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index 072604992c505fa3bab5398be3ef6f3272928e3b..d9c7fd124549d8f3b4281f420d66e8dc3ed17ef5 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -8,11 +8,11 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
-// License:     Rocketeer license
+// License:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
-// declatations
+// declarations
 // ============================================================================
 
 // ----------------------------------------------------------------------------
@@ -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
@@ -110,19 +110,14 @@ WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
-void wxToggleButton::SetLabel(const wxString& label)
-{
-    SetWindowText(GetHwnd(), label);
-}
-
 wxSize wxToggleButton::DoGetBestSize() const
 {
    wxString label = wxGetWindowText(GetHWND());
    int wBtn;
-   GetTextExtent(label, &wBtn, NULL);
+   GetTextExtent(wxStripMenuCodes(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;
@@ -130,18 +125,23 @@ wxSize wxToggleButton::DoGetBestSize() const
    // the button height is proportional to the height of the font used
    int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 
+#if wxUSE_BUTTON
    wxSize sz = wxButton::GetDefaultSize();
    if (wBtn > sz.x)
        sz.x = wBtn;
    if (hBtn > sz.y)
        sz.y = hBtn;
+#else
+   wxSize sz(wBtn, hBtn);
+#endif
 
+   CacheBestSize(sz);
    return sz;
 }
 
 void wxToggleButton::SetValue(bool val)
 {
-   SendMessage(GetHwnd(), BM_SETCHECK, val, 0);
+   ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0);
 }
 
 #ifndef BST_CHECKED
@@ -151,9 +151,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
 }