#include "wx/log.h"
#endif
-#include "wx/msw/private.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__)
item
*/
-// there are two possible ways to create the radio buttons: either as children
-// of the radiobox or as siblings of it - allow playing with both variants for
-// now, eventually we will choose the best one for our purposes
-//
-// two main problems are the keyboard navigation inside the radiobox (arrows
-// should switch between buttons, not pass focus to the next control) and the
-// tooltips - a tooltip is associated with the radiobox itself, not the
-// children...
-//
-// the problems with setting this to 1:
-// a) Alt-<mnemonic of radiobox> isn't handled properly by IsDialogMessage()
-// because it sets focus to the next control accepting it which is not a
-// radio button but a radiobox sibling in this case - the only solution to
-// this would be to handle Alt-<mnemonic> ourselves
-// b) the problems with setting radiobox colours under Win98/2K were reported
-// but I couldn't reproduce it so I have no idea about what causes it
-//
-// the problems with setting this to 0:
-// a) the tooltips are not shown for the radiobox - possible solution: make
-// TTM_WINDOWFROMPOS handling code in msw/tooltip.cpp work (easier said than
-// done because I don't know why it doesn't work)
-#define RADIOBTN_PARENT_IS_RADIOBOX 0
-
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
// wnd proc for radio buttons
-#ifdef __WIN32__
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
UINT message,
WPARAM wParam,
// the pointer to standard radio button wnd proc
static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
-#endif // __WIN32__
-
// ===========================================================================
// implementation
// ===========================================================================
// ---------------------------------------------------------------------------
-// wxRadioBox
+// wxRadioBox creation
// ---------------------------------------------------------------------------
-int wxRadioBox::GetCount() const
-{
- return m_noItems;
-}
-
-int wxRadioBox::GetColumnCount() const
-{
- return GetNumHor();
-}
-
-int wxRadioBox::GetRowCount() const
-{
- return GetNumVer();
-}
-
-// returns the number of rows
-int wxRadioBox::GetNumVer() const
-{
- if ( m_windowStyle & wxRA_SPECIFY_ROWS )
- {
- return m_majorDim;
- }
- else
- {
- return (m_noItems + m_majorDim - 1)/m_majorDim;
- }
-}
-
-// returns the number of columns
-int wxRadioBox::GetNumHor() const
-{
- if ( m_windowStyle & wxRA_SPECIFY_ROWS )
- {
- return (m_noItems + m_majorDim - 1)/m_majorDim;
- }
- else
- {
- return m_majorDim;
- }
-}
-
-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
-{
- if ( cmd == BN_CLICKED )
- {
- if (id == GetId())
- return true;
-
- int selectedButton = wxID_ANY;
-
- for ( int i = 0; i < m_noItems; i++ )
- {
- if ( id == wxGetWindowId(m_radioButtons[i]) )
- {
- selectedButton = i;
-
- break;
- }
- }
-
- if ( selectedButton == wxID_ANY )
- {
- // just ignore it - due to a hack with WM_NCHITTEST handling in our
- // wnd proc, we can receive dummy click messages when we click near
- // the radiobox edge (this is ugly but Julian wouldn't let me get
- // rid of this...)
- return false;
- }
-
- if ( selectedButton != m_selectedButton )
- {
- m_selectedButton = selectedButton;
-
- SendNotificationEvent();
- }
- //else: don't generate events when the selection doesn't change
-
- return true;
- }
- else
- return false;
-}
-
// Radio box item
-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()
{
- m_selectedButton = wxID_ANY;
- m_noItems = 0;
- m_noRowsOrCols = 0;
+ m_selectedButton = wxNOT_FOUND;
m_radioButtons = NULL;
m_majorDim = 0;
m_radioWidth = NULL;
const wxString& name)
{
// initialize members
- m_selectedButton = wxID_ANY;
- m_noItems = 0;
-
m_majorDim = majorDim == 0 ? n : majorDim;
- m_noRowsOrCols = majorDim;
// common initialization
- if ( !CreateControl(parent, id, pos, size, style, val, name) )
- return false;
-
- // create the static box
- if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP,
- pos, size, title, 0) )
+ if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
return false;
- // and now create the buttons
- m_noItems = n;
-#if RADIOBTN_PARENT_IS_RADIOBOX
- HWND hwndParent = GetHwnd();
+#if wxUSE_VALIDATORS
+ SetValidator(val);
#else
- HWND hwndParent = GetHwndOf(parent);
-#endif
+ wxUnusedVar(val);
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
- // Some radio boxes test consecutive id.
- (void)NewControlId();
- m_radioButtons = new WXHWND[n];
+ m_radioButtons = new wxSubwindows(n);
m_radioWidth = new int[n];
m_radioHeight = new int[n];
- WXHFONT hfont = 0;
- wxFont font = GetFont();
- if ( font.Ok() )
- {
- hfont = font.GetResourceHandle();
- }
-
for ( int i = 0; i < n; i++ )
{
m_radioWidth[i] =
m_radioHeight[i] = wxDefaultCoord;
long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
- if ( i == 0 && style == 0 )
+ if ( i == 0 )
styleBtn |= WS_GROUP;
long newId = NewControlId();
choices[i],
styleBtn,
0, 0, 0, 0, // will be set in SetSize()
- hwndParent,
+ GetHwnd(),
(HMENU)newId,
wxGetInstance(),
NULL);
return false;
}
- m_radioButtons[i] = (WXHWND)hwndBtn;
+ (*m_radioButtons)[i] = hwndBtn;
SubclassRadioButton((WXHWND)hwndBtn);
- if ( hfont )
- {
- ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
- }
-
m_subControls.Add(newId);
}
(void)::CreateWindow(_T("BUTTON"),
wxEmptyString,
WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
- 0, 0, 0, 0, hwndParent,
+ 0, 0, 0, 0, GetHwnd(),
(HMENU)NewControlId(), wxGetInstance(), NULL);
+ m_radioButtons->SetFont(GetFont());
+
#ifdef __WXWINCE__
// Set the z-order correctly
SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
{
m_isBeingDeleted = true;
- if (m_radioButtons)
+ delete m_radioButtons;
+ delete[] m_radioWidth;
+ delete[] m_radioHeight;
+}
+
+// NB: if this code is changed, wxGetWindowForHWND() which relies on having the
+// radiobox pointer in GWL_USERDATA for radio buttons must be updated too!
+void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
+{
+ HWND hwndBtn = (HWND)hWndBtn;
+
+ if ( !s_wndprocRadioBtn )
+ s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
+
+ wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
+ wxSetWindowUserData(hwndBtn, this);
+}
+
+// ----------------------------------------------------------------------------
+// events generation
+// ----------------------------------------------------------------------------
+
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
+{
+ if ( cmd == BN_CLICKED )
{
- int i;
- for (i = 0; i < m_noItems; i++)
- ::DestroyWindow((HWND)m_radioButtons[i]);
- delete[] m_radioButtons;
+ if (id == GetId())
+ return true;
+
+ int selectedButton = wxNOT_FOUND;
+
+ int count = GetCount();
+ for ( int i = 0; i < count; i++ )
+ {
+ if ( id == wxGetWindowId((*m_radioButtons)[i]) )
+ {
+ selectedButton = i;
+
+ break;
+ }
+ }
+
+ if ( selectedButton == wxNOT_FOUND )
+ {
+ // just ignore it - due to a hack with WM_NCHITTEST handling in our
+ // wnd proc, we can receive dummy click messages when we click near
+ // the radiobox edge (this is ugly but Julian wouldn't let me get
+ // rid of this...)
+ return false;
+ }
+
+ if ( selectedButton != m_selectedButton )
+ {
+ m_selectedButton = selectedButton;
+
+ SendNotificationEvent();
+ }
+ //else: don't generate events when the selection doesn't change
+
+ return true;
}
+ else
+ return false;
+}
- if (m_radioWidth)
- delete[] m_radioWidth;
- if (m_radioHeight)
- delete[] m_radioHeight;
+void wxRadioBox::Command(wxCommandEvent & event)
+{
+ SetSelection (event.GetInt());
+ SetFocus();
+ ProcessCommand(event);
+}
+void wxRadioBox::SendNotificationEvent()
+{
+ wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+ event.SetInt( m_selectedButton );
+ event.SetString( GetString(m_selectedButton) );
+ event.SetEventObject( this );
+ ProcessCommand(event);
}
-void wxRadioBox::SetString(int item, const wxString& label)
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------
+
+int wxRadioBox::GetCount() const
+{
+ return m_radioButtons->GetCount();
+}
+
+// returns the number of rows
+int wxRadioBox::GetNumVer() const
{
- wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
+ if ( m_windowStyle & wxRA_SPECIFY_ROWS )
+ {
+ return m_majorDim;
+ }
+ else
+ {
+ return (GetCount() + m_majorDim - 1)/m_majorDim;
+ }
+}
- m_radioWidth[item] = m_radioHeight[item] = wxDefaultCoord;
- SetWindowText((HWND)m_radioButtons[item], label.c_str());
+// 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::SetSelection(int N)
+void wxRadioBox::SetString(int item, const wxString& label)
{
- wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") );
+ wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
- // Following necessary for Win32s, because Win32s translate BM_SETCHECK
- if (m_selectedButton >= 0 && m_selectedButton < m_noItems)
- ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);
+ m_radioWidth[item] =
+ m_radioHeight[item] = wxDefaultCoord;
- ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
+ ::SetWindowText((*m_radioButtons)[item], label.c_str());
- m_selectedButton = N;
+ InvalidateBestSize();
}
-// Get single selection, for single choice list items
-int wxRadioBox::GetSelection() const
+void wxRadioBox::SetSelection(int N)
{
- return m_selectedButton;
+ wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") );
+
+ // unselect the old button
+ if ( m_selectedButton != wxNOT_FOUND )
+ ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L);
+
+ // and select the new one
+ ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L);
+
+ m_selectedButton = N;
}
// Find string for position
wxString wxRadioBox::GetString(int item) const
{
- wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString,
+ wxCHECK_MSG( IsValid(item), wxEmptyString,
wxT("invalid radiobox index") );
- return wxGetWindowText(m_radioButtons[item]);
+ return wxGetWindowText((*m_radioButtons)[item]);
+}
+
+void wxRadioBox::SetFocus()
+{
+ if ( GetCount() > 0 )
+ {
+ ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND
+ ? 0
+ : m_selectedButton]);
+ }
+}
+
+// Enable a specific button
+bool wxRadioBox::Enable(int item, bool enable)
+{
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::Enable()") );
+
+ BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
+
+ return (ret == 0) == enable;
+}
+
+// Show a specific button
+bool wxRadioBox::Show(int item, bool show)
+{
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::Show()") );
+
+ BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
+
+ bool changed = (ret != 0) == show;
+ if( changed )
+ InvalidateBestSize();
+ return changed;
}
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
+
// ----------------------------------------------------------------------------
// size calculations
// ----------------------------------------------------------------------------
// calculate the max button size
int widthMax = 0,
heightMax = 0;
- for ( int i = 0 ; i < m_noItems; i++ )
+ const int count = GetCount();
+ for ( int i = 0 ; i < count; i++ )
{
int width, height;
if ( m_radioWidth[i] < 0 )
{
- GetTextExtent(wxGetWindowText(m_radioButtons[i]), &width, &height);
+ GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height);
// adjust the size to take into account the radio box itself
// FIXME this is totally bogus!
int extraHeight = cy1;
- /* We'll assume the adjustments below are OK for Win 3.1 too
-#if defined(CTL3D) && !CTL3D
- // Requires a bigger group box in plain Windows
- extraHeight *= 3;
- extraHeight /= 2;
-#endif
- */
-
int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight;
int width = GetNumHor() * (sizeBtn.x + cx1) + cx1;
// Add extra space under the label, if it exists.
- if (!wxControl::GetLabel().IsEmpty())
+ if (!wxControl::GetLabel().empty())
height += cy1/2;
// and also wide enough for its label
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;
-#if RADIOBTN_PARENT_IS_RADIOBOX
int y_offset = 0;
int x_offset = 0;
-#else
- int y_offset = yy;
- int x_offset = xx;
-#endif
int cx1, cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
height = heightOld;
}
- ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
+ // if our parent had prepared a defer window handle for us, use it (unless
+ // we are a top level window)
+
+#if USE_DEFERRED_SIZING
+ wxWindowMSW *parent = GetParent();
+ HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
+#else
+ HDWP hdwp = 0;
+#endif
+
+ wxMoveWindowDeferred(hdwp, this, GetHwnd(), 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
y_offset += cy1;
// Add extra space under the label, if it exists.
- if (!wxControl::GetLabel().IsEmpty())
+ if (!wxControl::GetLabel().empty())
y_offset += cy1/2;
int startX = x_offset;
int startY = y_offset;
- for ( int i = 0; i < m_noItems; i++ )
+ const int count = GetCount();
+ for ( int i = 0; i < count; i++ )
{
// the last button in the row may be wider than the other ones as the
// radiobox may be wider than the sum of the button widths (as it
// 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 == m_noItems);
+ isLastInTheRow = ((n % m_majorDim) == 0) || (n == count);
}
else // wxRA_SPECIFY_ROWS
{
// item is the last in the row if it is in the last columns
- isLastInTheRow = i >= (m_noItems/m_majorDim)*m_majorDim;
+ isLastInTheRow = i >= (count/m_majorDim)*m_majorDim;
}
// is this the start of new row/column?
widthBtn = maxWidth;
}
- // VZ: make all buttons of the same, maximal size - like this they
- // cover 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((HWND)m_radioButtons[i],
+ // make all buttons of the same, maximal size - like this they cover
+ // 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);
x_offset += widthBtn + cx1;
}
}
-}
-
-void wxRadioBox::GetSize(int *width, int *height) const
-{
- RECT rect = { -1, -1, -1, -1 };
-
- if (m_hWnd)
- wxFindMaxSize(m_hWnd, &rect);
-
- int i;
- for (i = 0; i < m_noItems; i++)
- wxFindMaxSize(m_radioButtons[i], &rect);
-
- *width = rect.right - rect.left;
- *height = rect.bottom - rect.top;
-}
-
-void wxRadioBox::GetPosition(int *x, int *y) const
-{
- wxWindow *parent = GetParent();
- RECT rect = { -1, -1, -1, -1 };
-
- int i;
- for (i = 0; i < m_noItems; i++)
- wxFindMaxSize(m_radioButtons[i], &rect);
- if (m_hWnd)
- wxFindMaxSize(m_hWnd, &rect);
-
- // Since we now have the absolute screen coords, if there's a parent we
- // must subtract its top left corner
- POINT point;
- point.x = rect.left;
- point.y = rect.top;
+#if USE_DEFERRED_SIZING
if (parent)
{
- ::ScreenToClient((HWND) parent->GetHWND(), &point);
+ // hdwp must be updated as it may have been changed
+ parent->m_hDWP = (WXHANDLE)hdwp;
}
-
- // We may be faking the client origin. So a window that's really at (0, 30)
- // may appear (to wxWin apps) to be at (0, 0).
- if (GetParent())
- {
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- point.x -= pt.x;
- point.y -= pt.y;
- }
-
- *x = point.x;
- *y = point.y;
+#endif
}
-void wxRadioBox::SetFocus()
-{
- if (m_noItems > 0)
- {
- ::SetFocus((HWND)m_radioButtons[m_selectedButton == wxID_ANY
- ? 0
- : m_selectedButton]);
- }
+// ----------------------------------------------------------------------------
+// radio box drawing
+// ----------------------------------------------------------------------------
-}
+#ifndef __WXWINCE__
-bool wxRadioBox::Show(bool show)
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
{
- if ( !wxControl::Show(show) )
- return false;
+ RECT rc;
+ ::GetWindowRect(GetHwnd(), &rc);
+ HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- int nCmdShow = show ? SW_SHOW : SW_HIDE;
- for ( int i = 0; i < m_noItems; i++ )
+ const size_t count = GetCount();
+ for ( size_t i = 0; i < count; ++i )
{
- ::ShowWindow((HWND)m_radioButtons[i], nCmdShow);
+ ::GetWindowRect((*m_radioButtons)[i], &rc);
+ AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+ ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
}
- return true;
-}
-
-// Enable a specific button
-void wxRadioBox::Enable(int item, bool enable)
-{
- wxCHECK_RET( item >= 0 && item < m_noItems,
- wxT("invalid item in wxRadioBox::Enable()") );
-
- ::EnableWindow((HWND) m_radioButtons[item], enable);
+ return (WXHRGN)hrgn;
}
-// Enable all controls
-bool wxRadioBox::Enable(bool enable)
+WXLRESULT
+wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
- if ( !wxControl::Enable(enable) )
- return false;
-
- for (int i = 0; i < m_noItems; i++)
- ::EnableWindow((HWND) m_radioButtons[i], enable);
-
- return true;
-}
-
-// Show a specific button
-void wxRadioBox::Show(int item, bool show)
-{
- wxCHECK_RET( item >= 0 && item < m_noItems,
- wxT("invalid item in wxRadioBox::Show()") );
-
- ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE);
-}
-
-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
-{
- size_t count = GetCount();
- for ( size_t i = 0; i < count; i++ )
+ if ( nMsg == WM_PRINTCLIENT )
{
- if ( GetRadioButtons()[i] == hWnd )
- return true;
- }
-
- return false;
-}
+ // 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
-void wxRadioBox::Command(wxCommandEvent & event)
-{
- SetSelection (event.m_commandInt);
- SetFocus();
- ProcessCommand (event);
-}
-
-// NB: if this code is changed, wxGetWindowForHWND() which relies on having the
-// radiobox pointer in GWL_USERDATA for radio buttons must be updated too!
-void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
-{
- HWND hwndBtn = (HWND)hWndBtn;
-
- if ( !s_wndprocRadioBtn )
- s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
-
- wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
- wxSetWindowUserData(hwndBtn, this);
-}
-
-void wxRadioBox::SendNotificationEvent()
-{
- wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
- event.SetInt( m_selectedButton );
- event.SetString( GetString(m_selectedButton) );
- event.SetEventObject( this );
- ProcessCommand(event);
-}
+ // 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));
+ }
-bool wxRadioBox::SetFont(const wxFont& font)
-{
- if ( !wxControl::SetFont(font) )
- {
- // nothing to do
- return false;
+ return 0;
}
-
- // also set the font of our radio buttons
- WXHFONT hfont = wxFont(font).GetResourceHandle();
- for ( int n = 0; n < m_noItems; n++ )
+ // 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)
{
- HWND hwndBtn = (HWND)m_radioButtons[n];
- ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
-
- // otherwise the buttons are not redrawn correctly
- ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */);
+ WXLRESULT res = wxControl::MSWWindowProc(nMsg, wParam, lParam);
+ wxRect rect = GetRect();
+ GetParent()->Refresh(true, & rect);
+ return res;
}
- return true;
+ return wxStaticBox::MSWWindowProc(nMsg, wParam, lParam);
}
-// ----------------------------------------------------------------------------
-// our window proc
-// ----------------------------------------------------------------------------
-
-WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if RADIOBTN_PARENT_IS_RADIOBOX
- switch ( nMsg )
- {
- // handle this message to set correct colours for our buttons here
- case WM_CTLCOLORSTATIC:
- {
- WXHDC hdc;
- WXHWND hwnd;
- UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
-
- WXHBRUSH hbr = MSWControlColor((WXHDC)hdc);
- if ( hbr )
- return (WXLRESULT)hbr;
- //else: fall through to default window proc
- }
- }
-#endif // RADIOBTN_PARENT_IS_RADIOBOX
-
- return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
+#endif // __WXWINCE__
// ---------------------------------------------------------------------------
// window proc for radio buttons
// ---------------------------------------------------------------------------
-#ifdef __WIN32__
-
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
}
break;
-#ifdef __WIN32__
+#ifndef __WXWINCE__
case WM_HELP:
{
wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
- bool processed wxDUMMY_INITIALIZE(true);
+ bool processed = false;
+
+ wxEvtHandler * const handler = radiobox->GetEventHandler();
- // HELPINFO doesn't seem to be supported on WinCE.
-#ifndef __WXWINCE__
HELPINFO* info = (HELPINFO*) lParam;
- // Don't yet process menu help events, just windows
- if (info->iContextType == HELPINFO_WINDOW)
-#endif
+ if ( info->iContextType == HELPINFO_WINDOW )
{
- wxWindow* subjectOfHelp = radiobox;
- bool eventProcessed = false;
- while (subjectOfHelp && !eventProcessed)
+ for ( wxWindow* subjectOfHelp = radiobox;
+ subjectOfHelp;
+ subjectOfHelp = subjectOfHelp->GetParent() )
{
- wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(),
-#ifdef __WXWINCE__
- wxPoint(0, 0)
-#else
- wxPoint(info->MousePos.x, info->MousePos.y)
-#endif
- ) ; // info->iCtrlId);
+ wxHelpEvent helpEvent(wxEVT_HELP,
+ subjectOfHelp->GetId(),
+ wxPoint(info->MousePos.x,
+ info->MousePos.y));
helpEvent.SetEventObject(radiobox);
- eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
-
- // Go up the window hierarchy until the event is handled (or not)
- subjectOfHelp = subjectOfHelp->GetParent();
+ if ( handler->ProcessEvent(helpEvent) )
+ {
+ processed = true;
+ break;
+ }
}
- processed = eventProcessed;
}
-#ifndef __WXWINCE__
else if (info->iContextType == HELPINFO_MENUITEM)
{
- wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ;
+ wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId);
helpEvent.SetEventObject(radiobox);
- processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+ processed = handler->ProcessEvent(helpEvent);
}
- else
- processed = false;
-#endif
- if (processed)
- return 0;
- break;
+ if ( processed )
+ return 0;
}
-#endif // __WIN32__
+ break;
+#endif // !__WXWINCE__
}
return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
}
-#endif // __WIN32__
-
#endif // wxUSE_RADIOBOX
+
projects / wxWidgets.git / blobdiff