X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fac9339629ddd9a2e34d0c405e7aa4fdb35bd49f..8f2c3ee9a0fb0457f81f4d70ad0077bf092b8a6a:/src/msw/radiobox.cpp diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index 2d20f24418..ac037051d8 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_RADIOBOX + #ifndef WX_PRECOMP #include "wx/bitmap.h" #include "wx/brush.h" @@ -36,46 +38,78 @@ #include "wx/log.h" #endif -#include "wx/msw/private.h" +#include "wx/msw/subwin.h" #if wxUSE_TOOLTIPS - #ifndef __GNUWIN32_OLD__ + #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) #include #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS +// TODO: wxCONSTRUCTOR +#if 0 // wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxRadioBoxStyle ) + +wxBEGIN_FLAGS( wxRadioBoxStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxRA_SPECIFY_COLS) + wxFLAGS_MEMBER(wxRA_HORIZONTAL) + wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS) + wxFLAGS_MEMBER(wxRA_VERTICAL) + +wxEND_FLAGS( wxRadioBoxStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h") + +wxBEGIN_PROPERTIES_TABLE(wxRadioBox) + wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent ) + wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +#else IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) +#endif -// 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- 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- 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 +/* + selection + content + label + dimension + item +*/ // --------------------------------------------------------------------------- // private functions // --------------------------------------------------------------------------- // wnd proc for radio buttons -#ifdef __WIN32__ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, UINT message, WPARAM wParam, @@ -88,106 +122,18 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, // the pointer to standard radio button wnd proc static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL; -#endif // __WIN32__ - // =========================================================================== // implementation // =========================================================================== // --------------------------------------------------------------------------- -// wxRadioBox +// wxRadioBox creation // --------------------------------------------------------------------------- -// 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 = -1; - - for ( int i = 0; i < m_noItems; i++ ) - { - if ( id == wxGetWindowId(m_radioButtons[i]) ) - { - selectedButton = i; - - break; - } - } - - if ( selectedButton == -1 ) - { - // 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 WXWIN_COMPATIBILITY -wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title, - int x, int y, int width, int height, - int n, char **choices, - int majorDim, long style, const char *name) -{ - wxString *choices2 = new wxString[n]; - for ( int i = 0; i < n; i ++) choices2[i] = choices[i]; - Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, choices2, majorDim, style, - wxDefaultValidator, name); - Callback(func); - delete choices2; -} - -#endif // WXWIN_COMPATIBILITY - // Radio box item -wxRadioBox::wxRadioBox() +void wxRadioBox::Init() { - m_selectedButton = -1; - m_noItems = 0; - m_noRowsOrCols = 0; + m_selectedButton = wxNOT_FOUND; m_radioButtons = NULL; m_majorDim = 0; m_radioWidth = NULL; @@ -207,48 +153,28 @@ bool wxRadioBox::Create(wxWindow *parent, const wxString& name) { // initialize members - m_selectedButton = -1; - 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) ) - return FALSE; - - // and now create the buttons - m_noItems = n; -#if RADIOBTN_PARENT_IS_RADIOBOX - HWND hwndParent = GetHwnd(); + if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) ) + return false; + +#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] = -1; + 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(); @@ -257,7 +183,7 @@ bool wxRadioBox::Create(wxWindow *parent, choices[i], styleBtn, 0, 0, 0, 0, // will be set in SetSize() - hwndParent, + GetHwnd(), (HMENU)newId, wxGetInstance(), NULL); @@ -266,115 +192,242 @@ bool wxRadioBox::Create(wxWindow *parent, { wxLogLastError(wxT("CreateWindow(radio btn)")); - return FALSE; + 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); } // Create a dummy radio control to end the group. (void)::CreateWindow(_T("BUTTON"), - _T(""), + wxEmptyString, WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD, - 0, 0, 0, 0, hwndParent, + 0, 0, 0, 0, GetHwnd(), (HMENU)NewControlId(), wxGetInstance(), NULL); - SetSelection(0); + m_radioButtons->SetFont(GetFont()); + +#ifdef __WXWINCE__ + // Set the z-order correctly + SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); +#endif + SetSelection(0); SetSize(pos.x, pos.y, size.x, size.y); - return TRUE; + // Now that we have items determine what is the best size and set it. + SetBestSize(size); + + return true; +} + +bool wxRadioBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + int majorDim, + long style, + const wxValidator& val, + const wxString& name) +{ + wxCArrayString chs(choices); + return Create(parent, id, title, pos, size, chs.GetCount(), + chs.GetStrings(), majorDim, style, val, name); } wxRadioBox::~wxRadioBox() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; - if (m_radioButtons) - { - int i; - for (i = 0; i < m_noItems; i++) - ::DestroyWindow((HWND)m_radioButtons[i]); - delete[] 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 (m_radioWidth) - delete[] m_radioWidth; - if (m_radioHeight) - delete[] m_radioHeight; + if ( !s_wndprocRadioBtn ) + s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn); + wxSetWindowProc(hwndBtn, wxRadioBtnWndProc); + wxSetWindowUserData(hwndBtn, this); } -wxString wxRadioBox::GetLabel(int item) const +// ---------------------------------------------------------------------------- +// events generation +// ---------------------------------------------------------------------------- + +bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) { - wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); + if ( cmd == BN_CLICKED ) + { + 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; - return wxGetWindowText(m_radioButtons[item]); + 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; } -void wxRadioBox::SetLabel(int item, const wxString& label) +void wxRadioBox::Command(wxCommandEvent & event) { - wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); + SetSelection (event.GetInt()); + SetFocus(); + ProcessCommand(event); +} - m_radioWidth[item] = m_radioHeight[item] = -1; - SetWindowText((HWND)m_radioButtons[item], label.c_str()); +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::SetLabel(int item, wxBitmap *bitmap) +// ---------------------------------------------------------------------------- +// simple accessors +// ---------------------------------------------------------------------------- + +int wxRadioBox::GetCount() const { - /* - m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN; - m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN; - */ - wxFAIL_MSG(wxT("not implemented")); + return m_radioButtons->GetCount(); } -int wxRadioBox::FindString(const wxString& s) const +// returns the number of rows +int wxRadioBox::GetNumVer() const { - for (int i = 0; i < m_noItems; i++) + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) + { + return m_majorDim; + } + else { - if ( s == wxGetWindowText(m_radioButtons[i]) ) - return i; + return (GetCount() + m_majorDim - 1)/m_majorDim; } +} - return wxNOT_FOUND; +// 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_radioWidth[item] = + m_radioHeight[item] = wxDefaultCoord; + + ::SetWindowText((*m_radioButtons)[item], label.c_str()); } void wxRadioBox::SetSelection(int N) { - wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); + wxCHECK_RET( IsValid(N), 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); + // unselect the old button + if ( m_selectedButton != wxNOT_FOUND ) + ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L); - ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); - ::SetFocus((HWND)m_radioButtons[N]); + // and select the new one + ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L); m_selectedButton = N; } -// Get single selection, for single choice list items -int wxRadioBox::GetSelection() const +// Find string for position +wxString wxRadioBox::GetString(int item) const { - return m_selectedButton; + wxCHECK_MSG( IsValid(item), wxEmptyString, + wxT("invalid radiobox index") ); + + return wxGetWindowText((*m_radioButtons)[item]); } -// Find string for position -wxString wxRadioBox::GetString(int N) const +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) { - return wxGetWindowText(m_radioButtons[N]); + wxCHECK_MSG( IsValid(item), false, + wxT("invalid item in wxRadioBox::Show()") ); + + BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE); + + return (ret != 0) == show; } +WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons) + // ---------------------------------------------------------------------------- // size calculations // ---------------------------------------------------------------------------- @@ -384,12 +437,13 @@ wxSize wxRadioBox::GetMaxButtonSize() const // 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! @@ -416,19 +470,17 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const { // the radiobox should be big enough for its buttons int cx1, cy1; - wxGetCharSize(m_hWnd, &cx1, &cy1, &GetFont()); + wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); int extraHeight = cy1; -#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().empty()) + height += cy1/2; + // and also wide enough for its label int widthLabel; GetTextExtent(GetTitle(), &widthLabel, NULL); @@ -455,21 +507,16 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) int xx = x; int yy = y; - if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) xx = currentX; - if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + 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()); + wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); // Attempt to have a look coherent with other platforms: We compute the // biggest toggle dim, then we align all items according this value. @@ -482,7 +529,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) totHeight = totSize.y; // only change our width/height if asked for - if ( width == -1 ) + if ( width == wxDefaultCoord ) { if ( sizeFlags & wxSIZE_AUTO_WIDTH ) width = totWidth; @@ -490,7 +537,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) width = widthOld; } - if ( height == -1 ) + if ( height == wxDefaultCoord ) { if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) height = totHeight; @@ -514,15 +561,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) x_offset += cx1; y_offset += cy1; -#if defined(CTL3D) && (!CTL3D) - y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label - // JACS 2/12/93. CTL3D draws group label quite high. -#endif + // Add extra space under the label, if it exists. + 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 @@ -533,12 +580,12 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) // 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? @@ -573,11 +620,11 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) 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); @@ -597,284 +644,59 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) } } -void wxRadioBox::GetSize(int *width, int *height) const -{ - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -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 (parent) - { - ::ScreenToClient((HWND) parent->GetHWND(), &point); - } - - // 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; -} - -void wxRadioBox::SetFocus() -{ - if (m_noItems > 0) - { - if (m_selectedButton == -1) - ::SetFocus((HWND) m_radioButtons[0]); - else - ::SetFocus((HWND) m_radioButtons[m_selectedButton]); - } - -} - -bool wxRadioBox::Show(bool show) -{ - if ( !wxControl::Show(show) ) - return FALSE; - - int nCmdShow = show ? SW_SHOW : SW_HIDE; - for ( int i = 0; i < m_noItems; i++ ) - { - ::ShowWindow((HWND)m_radioButtons[i], nCmdShow); - } - - 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); -} - -// Enable all controls -bool wxRadioBox::Enable(bool enable) -{ - 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); -} - -// For single selection items only -wxString wxRadioBox::GetStringSelection() const -{ - wxString result; - int sel = GetSelection(); - if (sel > -1) - result = GetString(sel); - - return result; -} - -bool wxRadioBox::SetStringSelection(const wxString& s) -{ - int sel = FindString (s); - if (sel > -1) - { - SetSelection (sel); - return TRUE; - } - else - return FALSE; -} - -bool wxRadioBox::ContainsHWND(WXHWND hWnd) const -{ - int i; - for (i = 0; i < Number(); i++) - { - if (GetRadioButtons()[i] == hWnd) - return TRUE; - } - - return FALSE; -} - -void wxRadioBox::Command(wxCommandEvent & event) -{ - SetSelection (event.m_commandInt); - 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) -{ - // No GWL_USERDATA in Win16, so omit this subclassing. -#ifdef __WIN32__ - HWND hwndBtn = (HWND)hWndBtn; - - if ( !s_wndprocRadioBtn ) - s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); - - ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); - ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); -#endif // __WIN32__ -} +// ---------------------------------------------------------------------------- +// radio box drawing +// ---------------------------------------------------------------------------- -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); -} +#ifndef __WXWINCE__ -bool wxRadioBox::SetFont(const wxFont& font) +WXHRGN wxRadioBox::MSWGetRegionWithoutChildren() { - if ( !wxControl::SetFont(font) ) - { - // nothing to do - return FALSE; - } + RECT rc; + ::GetWindowRect(GetHwnd(), &rc); + HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); - // also set the font of our radio buttons - WXHFONT hfont = wxFont(font).GetResourceHandle(); - for ( int n = 0; n < m_noItems; n++ ) + const size_t count = GetCount(); + for ( size_t i = 0; i < count; ++i ) { - 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 */); + ::GetWindowRect((*m_radioButtons)[i], &rc); + AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc)); + ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF); } - return TRUE; + return (WXHRGN)hrgn; } -// ---------------------------------------------------------------------------- -// our window proc -// ---------------------------------------------------------------------------- - -long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT +wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - switch ( nMsg ) + if ( nMsg == WM_PRINTCLIENT ) { -#ifdef __WIN32__ - case WM_CTLCOLORSTATIC: - // set the colour of the radio buttons to be the same as ours - { - HDC hdc = (HDC)wParam; - - const wxColour& colBack = GetBackgroundColour(); - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); - - return (WXHBRUSH)brush->GetResourceHandle(); - } -#endif // Win32 - - // This is required for the radiobox to be sensitive to mouse input, - // e.g. for Dialog Editor. - case WM_NCHITTEST: - { - int xPos = LOWORD(lParam); // horizontal position of cursor - int yPos = HIWORD(lParam); // vertical position of cursor + // 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 - ScreenToClient(&xPos, &yPos); + // 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) + wxFillRect(GetHwnd(), (HDC)wParam, + GetHbrushOf(wxBrush(GetParent()->GetBackgroundColour()))); + } - // Make sure you can drag by the top of the groupbox, but let - // other (enclosed) controls get mouse events also - if (yPos < 10) - return (long)HTCLIENT; - } - break; + return 0; } - return wxControl::MSWWindowProc(nMsg, wParam, lParam); -} - -WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) -{ -#if wxUSE_CTL3D - if ( m_useCtl3D ) - { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; - } -#endif // wxUSE_CTL3D - - HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - - wxColour colBack = GetBackgroundColour(); - - if (!IsEnabled()) - colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); - - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); - - return (WXHBRUSH)brush->GetResourceHandle(); + return wxStaticBox::MSWWindowProc(nMsg, wParam, lParam); } +#endif // __WXWINCE__ // --------------------------------------------------------------------------- // window proc for radio buttons // --------------------------------------------------------------------------- -#ifdef __WIN32__ - LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, UINT message, WPARAM wParam, @@ -897,10 +719,10 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, case WM_NOTIFY: { NMHDR* hdr = (NMHDR *)lParam; - if ( (int)hdr->code == TTN_NEEDTEXT ) + if ( hdr->code == TTN_NEEDTEXT ) { - wxRadioBox *radiobox = (wxRadioBox *) - ::GetWindowLong(hwnd, GWL_USERDATA); + wxRadioBox * + radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); @@ -921,102 +743,52 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, case WM_KEYDOWN: { - wxRadioBox *radiobox = (wxRadioBox *) - ::GetWindowLong(hwnd, GWL_USERDATA); + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); - bool processed = TRUE; - - bool horz = (radiobox->GetWindowStyle() & wxRA_SPECIFY_COLS) != 0; - int num = radiobox->Number(), - rows = radiobox->GetNumVer(), - cols = radiobox->GetNumHor(); + bool processed = true; - int selOld = radiobox->GetSelection(); - int selNew = selOld; - - // wrapping will be handled below for the cases when we - // add/substract more than 1 but here otherwise as it's simpler + wxDirection dir; switch ( wParam ) { case VK_UP: - if ( horz ) - selNew -= cols; - else - { - if ( selNew ) - selNew--; - else - selNew = num - 1; - } + dir = wxUP; break; case VK_LEFT: - if ( horz ) - { - if ( selNew ) - selNew--; - else - selNew = num - 1; - } - else - selNew -= rows; + dir = wxLEFT; break; case VK_DOWN: - if ( horz ) - selNew += cols; - else - { - if ( ++selNew == num ) - selNew = 0; - } + dir = wxDOWN; break; case VK_RIGHT: - if ( horz ) - { - if ( ++selNew == num ) - selNew = 0; - } - else - selNew += rows; + dir = wxRIGHT; break; default: - processed = FALSE; + processed = false; + + // just to suppress the compiler warning + dir = wxALL; } if ( processed ) { - // ensure that selNew is in range [0..num) - if ( selNew >= num ) - { - selNew -= num; - - int dim = horz ? cols : rows; - selNew += dim - 1; - selNew %= dim; - } - else if ( selNew < 0 ) - { - selNew += num; - - int dim = horz ? cols : rows; - if ( selNew % dim == 0 ) - { - selNew -= dim - 1; - } - else - { - selNew++; - } - } + int selOld = radiobox->GetSelection(); + int selNew = radiobox->GetNextItem + ( + selOld, + dir, + radiobox->GetWindowStyle() + ); if ( selNew != selOld ) { radiobox->SetSelection(selNew); + radiobox->SetFocus(); // emulate the button click radiobox->SendNotificationEvent(); @@ -1025,51 +797,72 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, } } } -#ifdef __WIN32__ - case WM_HELP: - { - wxRadioBox *radiobox = (wxRadioBox *) - ::GetWindowLong(hwnd, GWL_USERDATA); + break; - wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + case WM_SETFOCUS: + case WM_KILLFOCUS: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); - bool processed = TRUE; + // if we don't do this, no focus events are generated for the + // radiobox and, besides, we need to notify the parent about + // the focus change, otherwise the focus handling logic in + // wxControlContainer doesn't work + if ( message == WM_SETFOCUS ) + radiobox->HandleSetFocus((WXHWND)wParam); + else + radiobox->HandleKillFocus((WXHWND)wParam); + } + break; - HELPINFO* info = (HELPINFO*) lParam; - // Don't yet process menu help events, just windows - if (info->iContextType == HELPINFO_WINDOW) +#ifndef __WXWINCE__ + case WM_HELP: { - wxWindow* subjectOfHelp = radiobox; - bool eventProcessed = FALSE; - while (subjectOfHelp && !eventProcessed) + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + bool processed = false; + + wxEvtHandler * const handler = radiobox->GetEventHandler(); + + HELPINFO* info = (HELPINFO*) lParam; + if ( info->iContextType == HELPINFO_WINDOW ) + { + for ( wxWindow* subjectOfHelp = radiobox; + subjectOfHelp; + subjectOfHelp = subjectOfHelp->GetParent() ) + { + wxHelpEvent helpEvent(wxEVT_HELP, + subjectOfHelp->GetId(), + wxPoint(info->MousePos.x, + info->MousePos.y)); + helpEvent.SetEventObject(radiobox); + if ( handler->ProcessEvent(helpEvent) ) + { + processed = true; + break; + } + } + } + else if (info->iContextType == HELPINFO_MENUITEM) { - wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), wxPoint(info->MousePos.x, info->MousePos.y) ) ; // info->iCtrlId); + wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId); helpEvent.SetEventObject(radiobox); - eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent); - - // Go up the window hierarchy until the event is handled (or not) - subjectOfHelp = subjectOfHelp->GetParent(); + processed = handler->ProcessEvent(helpEvent); } - processed = eventProcessed; - } - else if (info->iContextType == HELPINFO_MENUITEM) - { - wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ; - helpEvent.SetEventObject(radiobox); - processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent); - } - else processed = FALSE; - - if (processed) - return 0; + if ( processed ) + return 0; + } break; - } -#endif +#endif // !__WXWINCE__ } return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); } -#endif // __WIN32__ +#endif // wxUSE_RADIOBOX