added wxDebugContext::SetShutdownNotifyFunction() (patch 1887210)

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index af016c9a1599bd7593b79cf0e4d8f32ff5fdcaf0..4fc2d2acbd9e373c572a30683c6eb208bffa20f3 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -129,6 +129,7 @@ void wxRadioBox::Init()
 {
     m_selectedButton = wxNOT_FOUND;
     m_radioButtons = NULL;
 {
     m_selectedButton = wxNOT_FOUND;
     m_radioButtons = NULL;

+    m_dummyHwnd = NULL;

     m_radioWidth = NULL;
     m_radioHeight = NULL;
 }
     m_radioWidth = NULL;
     m_radioHeight = NULL;
 }


@@ -155,7 +156,15 @@ bool wxRadioBox::Create(wxWindow *parent,
     wxUnusedVar(val);
 #endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 
     wxUnusedVar(val);
 #endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 

+    // We need an extra one to keep track of the 'dummy' item we
+    // create to end the radio group, so it will be destroyed and
+    // it's id will be released.  But we want it separate from the
+    // other buttons since the wxSubwindows will operate on it as
+    // well and we just want to ignore it until destroying it.
+    // For instance, we don't want the bounding box of the radio
+    // buttons to include the dummy button

     m_radioButtons = new wxSubwindows(n);
     m_radioButtons = new wxSubwindows(n);

+

     m_radioWidth = new int[n];
     m_radioHeight = new int[n];
 
     m_radioWidth = new int[n];
     m_radioHeight = new int[n];
 


@@ -167,14 +176,14 @@ bool wxRadioBox::Create(wxWindow *parent,
         if ( i == 0 )
             styleBtn |= WS_GROUP;
 
         if ( i == 0 )
             styleBtn |= WS_GROUP;
 

-        long newId = NewControlId();
+        wxWindowIDRef subid = NewControlId();

 
         HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
 
         HWND hwndBtn = ::CreateWindow(_T("BUTTON"),

-                                      choices[i],
+                                      choices[i].wx_str(),

                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()
                                       GetHwndOf(parent),
                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()
                                       GetHwndOf(parent),

-                                      (HMENU)newId,
+                                      (HMENU)subid.GetValue(),

                                       wxGetInstance(),
                                       NULL);
 
                                       wxGetInstance(),
                                       NULL);
 


@@ -185,19 +194,24 @@ bool wxRadioBox::Create(wxWindow *parent,
             return false;
         }
 
             return false;
         }
 

-        (*m_radioButtons)[i] = hwndBtn;
+        // Keep track of the subwindow
+        m_radioButtons->Set(i, hwndBtn, subid);

 
         SubclassRadioButton((WXHWND)hwndBtn);
 
 
         SubclassRadioButton((WXHWND)hwndBtn);
 

-        m_subControls.Add(newId);
+        // Also, make it a subcontrol of this control
+        m_subControls.Add(subid);

     }
 
     // Create a dummy radio control to end the group.
     }
 
     // Create a dummy radio control to end the group.

-    (void)::CreateWindow(_T("BUTTON"),
+    m_dummyId = NewControlId();
+
+    m_dummyHwnd = (WXHWND)::CreateWindow(_T("BUTTON"),

                          wxEmptyString,
                          WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
                          0, 0, 0, 0, GetHwndOf(parent),
                          wxEmptyString,
                          WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
                          0, 0, 0, 0, GetHwndOf(parent),

-                         (HMENU)NewControlId(), wxGetInstance(), NULL);
+                         (HMENU)m_dummyId.GetValue(), wxGetInstance(), NULL);
+

 
     m_radioButtons->SetFont(GetFont());
 
 
     m_radioButtons->SetFont(GetFont());
 


@@ -206,10 +220,6 @@ bool wxRadioBox::Create(wxWindow *parent,
     SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
 #endif
 
     SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
 #endif
 

-    // Have to invalidate the best size as it may have been calculated
-    // before the number of buttons was known
-    InvalidateBestSize();
-

     SetMajorDim(majorDim == 0 ? n : majorDim, style);
     SetSelection(0);
     SetSize(pos.x, pos.y, size.x, size.y);
     SetMajorDim(majorDim == 0 ? n : majorDim, style);
     SetSelection(0);
     SetSize(pos.x, pos.y, size.x, size.y);


@@ -241,6 +251,8 @@ wxRadioBox::~wxRadioBox()
     m_isBeingDeleted = true;
 
     delete m_radioButtons;
     m_isBeingDeleted = true;
 
     delete m_radioButtons;

+    if ( m_dummyHwnd )
+        DestroyWindow((HWND)m_dummyHwnd);

     delete[] m_radioWidth;
     delete[] m_radioHeight;
 }
     delete[] m_radioWidth;
     delete[] m_radioHeight;
 }


@@ -262,8 +274,10 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
 // events generation
 // ----------------------------------------------------------------------------
 
 // events generation
 // ----------------------------------------------------------------------------
 

-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)

 {
 {

+    const int id = (signed short)id_;
+

     if ( cmd == BN_CLICKED )
     {
         if (id == GetId())
     if ( cmd == BN_CLICKED )
     {
         if (id == GetId())


@@ -274,9 +288,14 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
         const unsigned int count = GetCount();
         for ( unsigned int i = 0; i < count; i++ )
         {
         const unsigned int count = GetCount();
         for ( unsigned int i = 0; i < count; i++ )
         {

-            if ( id == wxGetWindowId((*m_radioButtons)[i]) )
+            const HWND hwndBtn = (*m_radioButtons)[i];
+            if ( id == wxGetWindowId(hwndBtn) )

             {
             {

-                selectedButton = i;
+                // we can get BN_CLICKED for a button which just became focused
+                // but it may not be checked, in which case we shouldn't
+                // generate a radiobox selection changed event for it
+                if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED )
+                    selectedButton = i;

 
                 break;
             }
 
                 break;
             }


@@ -509,6 +528,13 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 
 wxSize wxRadioBox::DoGetBestSize() const
 {
 
 wxSize wxRadioBox::DoGetBestSize() const
 {

+    if ( !m_radioButtons )
+    {
+        // if we're not fully initialized yet, we can't meaningfully compute
+        // our best size, we'll do it later
+        return wxSize(1, 1);
+    }
+

     wxSize best = GetTotalButtonSize(GetMaxButtonSize());
     CacheBestSize(best);
     return best;
     wxSize best = GetTotalButtonSize(GetMaxButtonSize());
     CacheBestSize(best);
     return best;