/////////////////////////////////////////////////////////////////////////////
-// Name: msw/radiobox.cpp
+// Name: src/msw/radiobox.cpp
// Purpose: wxRadioBox implementation
// Author: Julian Smart
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "radiobox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/msw/subwin.h"
-// This is switched off because in some situations, the radiobox
-// buttons simply don't appear when deferred sizing is on.
-// Instead, refreshing on WM_MOVE seems to at least cure the droppings.
-#define USE_DEFERRED_SIZING 0
-
#if wxUSE_TOOLTIPS
#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
#include <commctrl.h>
{
m_selectedButton = wxNOT_FOUND;
m_radioButtons = NULL;
- m_majorDim = 0;
m_radioWidth = NULL;
m_radioHeight = NULL;
}
const wxValidator& val,
const wxString& name)
{
- // initialize members
- m_majorDim = majorDim == 0 ? n : majorDim;
-
// common initialization
if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
return false;
choices[i],
styleBtn,
0, 0, 0, 0, // will be set in SetSize()
- GetHwnd(),
+ GetHwndOf(parent),
(HMENU)newId,
wxGetInstance(),
NULL);
(void)::CreateWindow(_T("BUTTON"),
wxEmptyString,
WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
- 0, 0, 0, 0, GetHwnd(),
+ 0, 0, 0, 0, GetHwndOf(parent),
(HMENU)NewControlId(), wxGetInstance(), NULL);
m_radioButtons->SetFont(GetFont());
SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
#endif
+ SetMajorDim(majorDim == 0 ? n : majorDim, style);
SetSelection(0);
SetSize(pos.x, pos.y, size.x, size.y);
return m_radioButtons->GetCount();
}
-// returns the number of rows
-int wxRadioBox::GetNumVer() const
-{
- if ( m_windowStyle & wxRA_SPECIFY_ROWS )
- {
- return m_majorDim;
- }
- else
- {
- return (GetCount() + m_majorDim - 1)/m_majorDim;
- }
-}
-
-// returns the number of columns
-int wxRadioBox::GetNumHor() const
-{
- if ( m_windowStyle & wxRA_SPECIFY_ROWS )
- {
- return (GetCount() + m_majorDim - 1)/m_majorDim;
- }
- else
- {
- return m_majorDim;
- }
-}
-
void wxRadioBox::SetString(int item, const wxString& label)
{
wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
m_radioHeight[item] = wxDefaultCoord;
::SetWindowText((*m_radioButtons)[item], label.c_str());
+
+ InvalidateBestSize();
}
void wxRadioBox::SetSelection(int N)
BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
- return (ret == 0) == enable;
+ return (ret == 0) != enable;
+}
+
+bool wxRadioBox::IsItemEnabled(int item) const
+{
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::IsItemEnabled()") );
+
+ return ::IsWindowEnabled((*m_radioButtons)[item]) != 0;
}
// Show a specific button
BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
- return (ret != 0) == show;
+ bool changed = (ret != 0) != show;
+ if ( changed )
+ {
+ InvalidateBestSize();
+ }
+
+ return changed;
+}
+
+bool wxRadioBox::IsItemShown(int item) const
+{
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::IsItemShown()") );
+
+ // don't use IsWindowVisible() here because it would return false if the
+ // radiobox itself is hidden while we want to only return false if this
+ // button specifically is hidden
+ return (::GetWindowLong((*m_radioButtons)[item],
+ GWL_STYLE) & WS_VISIBLE) != 0;
}
WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
int extraHeight = cy1;
- int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight;
- int width = GetNumHor() * (sizeBtn.x + cx1) + cx1;
+ int height = GetRowCount() * sizeBtn.y + cy1/2 + extraHeight;
+ int width = GetColumnCount() * (sizeBtn.x + cx1) + cx1;
// Add extra space under the label, if it exists.
if (!wxControl::GetLabel().empty())
// and also wide enough for its label
int widthLabel;
- GetTextExtent(GetTitle(), &widthLabel, NULL);
+ GetTextExtent(wxStripMenuCodes(GetLabel()), &widthLabel, NULL);
widthLabel += RADIO_SIZE; // FIXME this is bogus too
if ( widthLabel > width )
width = widthLabel;
wxSize wxRadioBox::DoGetBestSize() const
{
- return GetTotalButtonSize(GetMaxButtonSize());
+ wxSize best = GetTotalButtonSize(GetMaxButtonSize());
+ CacheBestSize(best);
+ return best;
}
// Restored old code.
if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
yy = currentY;
- int y_offset = 0;
- int x_offset = 0;
+ int y_offset = yy;
+ int x_offset = xx;
int cx1, cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
height = heightOld;
}
- // if our parent had prepared a defer window handle for us, use it (unless
- // we are a top level window)
- wxWindowMSW *parent = GetParent();
-
-#if USE_DEFERRED_SIZING
- HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
-#else
- HDWP hdwp = 0;
-#endif
-
- wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height);
+ DoMoveWindow(xx, yy, width, height);
// Now position all the buttons: the current button will be put at
// wxPoint(x_offset, y_offset) and the new row/column will start at
// to the right border of radiobox and thus can be wider than this.
// Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in
- // left to right order and m_majorDim is the number of columns while
+ // left to right order and GetMajorDim() is the number of columns while
// wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
- // m_majorDim is the number of rows.
+ // GetMajorDim() is the number of rows.
x_offset += cx1;
y_offset += cy1;
// item is the last in its row if it is a multiple of the number of
// columns or if it is just the last item
int n = i + 1;
- isLastInTheRow = ((n % m_majorDim) == 0) || (n == count);
+ isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count);
}
else // wxRA_SPECIFY_ROWS
{
// item is the last in the row if it is in the last columns
- isLastInTheRow = i >= (count/m_majorDim)*m_majorDim;
+ isLastInTheRow = i >= (count/GetMajorDim())*GetMajorDim();
}
// is this the start of new row/column?
- if ( i && (i % m_majorDim == 0) )
+ if ( i && (i % GetMajorDim() == 0) )
{
if ( m_windowStyle & wxRA_SPECIFY_ROWS )
{
// the radiobox entirely and the radiobox tooltips are always shown
// (otherwise they are not when the mouse pointer is in the radiobox
// part not belonging to any radiobutton)
- ::MoveWindow((*m_radioButtons)[i],
- x_offset, y_offset, widthBtn, maxHeight,
- TRUE);
+ DoMoveSibling((*m_radioButtons)[i], x_offset, y_offset, widthBtn, maxHeight);
// where do we put the next button?
if ( m_windowStyle & wxRA_SPECIFY_ROWS )
x_offset += widthBtn + cx1;
}
}
- if (hdwp)
- {
- // Store the size so we can report it accurately
- wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
- if (!extraData)
- {
- extraData = new wxExtraWindowData;
- m_windowReserved = (void*) extraData;
- }
- extraData->m_pos = wxPoint(xx, yy);
- extraData->m_size = wxSize(width, height);
- extraData->m_deferring = true;
-
- // hdwp must be updated as it may have been changed
- parent->m_hDWP = (WXHANDLE)hdwp;
- }
}
// ----------------------------------------------------------------------------
const size_t count = GetCount();
for ( size_t i = 0; i < count; ++i )
{
+ // don't clip out hidden children
+ if ( !IsItemShown(i) )
+ continue;
+
::GetWindowRect((*m_radioButtons)[i], &rc);
AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
return (WXHRGN)hrgn;
}
-WXLRESULT
-wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
- if ( nMsg == WM_PRINTCLIENT )
- {
- // we have to process WM_PRINTCLIENT ourselves as otherwise the radio
- // buttons background would never be drawn unless we have a parent with
- // non default background
-
- // so check first if we have one
- if ( !HandlePrintClient((WXHDC)wParam) )
- {
- // no, we don't, erase the background ourselves (don't use our own
- // colour as with static box, see comments there)
- wxBrush brush(GetParent()->GetBackgroundColour());
- wxFillRect(GetHwnd(), (HDC)wParam, GetHbrushOf(brush));
- }
-
- return 0;
- }
- // 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?)
- else 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 // wxUSE_RADIOBOX
-
projects / wxWidgets.git / blobdiff