Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make radiobuttons siblings instead of children in radioboxes again and remove refresh hack. Fixes bug #1387591.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jamie Gadd
2006-01-02 11:03:28 +00:00
parent 25eb6881f7
commit 99c613c5c4
2 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/radiobox.h
View File

@@ -138,9 +138,6 @@ protected:
#ifndef __WXWINCE__ #ifndef __WXWINCE__
virtual WXHRGN MSWGetRegionWithoutChildren(); virtual WXHRGN MSWGetRegionWithoutChildren();
virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam);
#endif // __WXWINCE__ #endif // __WXWINCE__

30
src/msw/radiobox.cpp
View File

@@ -175,7 +175,7 @@ bool wxRadioBox::Create(wxWindow *parent,
choices[i], choices[i],
styleBtn, styleBtn,
0, 0, 0, 0, // will be set in SetSize() 0, 0, 0, 0, // will be set in SetSize()
GetHwnd(), GetHwndOf(parent),
(HMENU)newId, (HMENU)newId,
wxGetInstance(), wxGetInstance(),
NULL); NULL);
@@ -198,7 +198,7 @@ bool wxRadioBox::Create(wxWindow *parent,
(void)::CreateWindow(_T("BUTTON"), (void)::CreateWindow(_T("BUTTON"),
wxEmptyString, wxEmptyString,
WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD, WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
0, 0, 0, 0, GetHwnd(), 0, 0, 0, 0, GetHwndOf(parent),
(HMENU)NewControlId(), wxGetInstance(), NULL); (HMENU)NewControlId(), wxGetInstance(), NULL);
m_radioButtons->SetFont(GetFont()); m_radioButtons->SetFont(GetFont());
@@ -509,8 +509,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
yy = currentY; yy = currentY;
int y_offset = 0; int y_offset = yy;
int x_offset = 0; int x_offset = xx;
int cx1, cy1; int cx1, cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
@@ -621,9 +621,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// the radiobox entirely and the radiobox tooltips are always shown // the radiobox entirely and the radiobox tooltips are always shown
// (otherwise they are not when the mouse pointer is in the radiobox // (otherwise they are not when the mouse pointer is in the radiobox
// part not belonging to any radiobutton) // part not belonging to any radiobutton)
::MoveWindow((*m_radioButtons)[i], DoMoveSibling((*m_radioButtons)[i], x_offset, y_offset, widthBtn, maxHeight);
x_offset, y_offset, widthBtn, maxHeight,
TRUE);
// where do we put the next button? // where do we put the next button?
if ( m_windowStyle & wxRA_SPECIFY_ROWS ) if ( m_windowStyle & wxRA_SPECIFY_ROWS )
@@ -668,24 +666,6 @@ WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
return (WXHRGN)hrgn; return (WXHRGN)hrgn;
} }
WXLRESULT
wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
// FIXME: Without this, the radiobox corrupts other controls as it moves
// in a dynamic layout. Refreshing causes flicker, but it's better than
// leaving droppings. Note that for some reason, wxStaticBox doesn't need
// this (perhaps because it has no real children?)
if ( nMsg == WM_MOVE )
{
WXLRESULT res = wxControl::MSWWindowProc(nMsg, wParam, lParam);
wxRect rect = GetRect();
GetParent()->Refresh(true, & rect);
return res;
}
return wxStaticBox::MSWWindowProc(nMsg, wParam, lParam);
}
#endif // __WXWINCE__ #endif // __WXWINCE__
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------