X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a17e237f4ada1196d7c0f0c23d4dface749c587a..c616c2e834192db06bbef18b9404824f563e335f:/src/msw/radiobox.cpp diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index 48666d0859..795df4f865 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp -// Purpose: wxRadioBox +// Name: src/msw/radiobox.cpp +// Purpose: wxRadioBox implementation // Author: Julian Smart // 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,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "radiobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,26 +24,88 @@ #pragma hdrstop #endif +#if wxUSE_RADIOBOX + #ifndef WX_PRECOMP - #include - #include "wx/setup.h" #include "wx/bitmap.h" #include "wx/brush.h" #include "wx/radiobox.h" + #include "wx/settings.h" + #include "wx/log.h" #endif -#include "wx/msw/private.h" - -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) +#include "wx/msw/subwin.h" + +#if wxUSE_TOOLTIPS + #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 +/* + selection + content + label + dimension + item +*/ + // --------------------------------------------------------------------------- // private functions // --------------------------------------------------------------------------- // wnd proc for radio buttons -#ifdef __WIN32__ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, UINT message, WPARAM wParam, @@ -60,49 +118,161 @@ 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 // --------------------------------------------------------------------------- -int wxRadioBox::GetNumVer() const +// Radio box item +void wxRadioBox::Init() { - if ( m_windowStyle & wxRA_SPECIFY_ROWS ) - { - return m_majorDim; - } - else - { - return (m_noItems + m_majorDim - 1)/m_majorDim; - } + m_selectedButton = wxNOT_FOUND; + m_radioButtons = NULL; + m_radioWidth = NULL; + m_radioHeight = NULL; } -int wxRadioBox::GetNumHor() const +bool wxRadioBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + int n, + const wxString choices[], + int majorDim, + long style, + const wxValidator& val, + const wxString& name) { - if ( m_windowStyle & wxRA_SPECIFY_ROWS ) - { - return (m_noItems + m_majorDim - 1)/m_majorDim; - } - else + // common initialization + if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) ) + return false; + +#if wxUSE_VALIDATORS + SetValidator(val); +#else + wxUnusedVar(val); +#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS + + m_radioButtons = new wxSubwindows(n); + m_radioWidth = new int[n]; + m_radioHeight = new int[n]; + + for ( int i = 0; i < n; i++ ) { - return m_majorDim; + m_radioWidth[i] = + m_radioHeight[i] = wxDefaultCoord; + long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE; + if ( i == 0 ) + styleBtn |= WS_GROUP; + + long newId = NewControlId(); + + HWND hwndBtn = ::CreateWindow(_T("BUTTON"), + choices[i], + styleBtn, + 0, 0, 0, 0, // will be set in SetSize() + GetHwndOf(parent), + (HMENU)newId, + wxGetInstance(), + NULL); + + if ( !hwndBtn ) + { + wxLogLastError(wxT("CreateWindow(radio btn)")); + + return false; + } + + (*m_radioButtons)[i] = hwndBtn; + + SubclassRadioButton((WXHWND)hwndBtn); + + m_subControls.Add(newId); } + + // Create a dummy radio control to end the group. + (void)::CreateWindow(_T("BUTTON"), + wxEmptyString, + WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD, + 0, 0, 0, 0, GetHwndOf(parent), + (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); +#endif + + SetMajorDim(majorDim == 0 ? n : majorDim, style); + SetSelection(0); + SetSize(pos.x, pos.y, size.x, size.y); + + // 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; + + 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 selectedButton = -1; + if (id == GetId()) + return true; - for ( int i = 0; i < m_noItems; i++ ) + int selectedButton = wxNOT_FOUND; + + int count = GetCount(); + for ( int i = 0; i < count; i++ ) { - if ( id == wxGetWindowId(m_radioButtons[i]) ) + if ( id == wxGetWindowId((*m_radioButtons)[i]) ) { selectedButton = i; @@ -110,7 +280,14 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) } } - wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") ); + 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 ) { @@ -120,232 +297,200 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) } //else: don't generate events when the selection doesn't change - return TRUE; + return true; } else - return FALSE; + 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) +void wxRadioBox::Command(wxCommandEvent & event) { - 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; + SetSelection (event.GetInt()); + SetFocus(); + ProcessCommand(event); } -#endif - -// Radio box item -wxRadioBox::wxRadioBox() +void wxRadioBox::SendNotificationEvent() { - m_selectedButton = -1; - m_noItems = 0; - m_noRowsOrCols = 0; - m_radioButtons = NULL; - m_majorDim = 0; - m_radioWidth = NULL; - m_radioHeight = NULL; + wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); + event.SetInt( m_selectedButton ); + event.SetString( GetString(m_selectedButton) ); + event.SetEventObject( this ); + ProcessCommand(event); } -bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], - int majorDim, long style, - const wxValidator& val, const wxString& name) -{ - m_selectedButton = -1; - m_noItems = n; - - SetName(name); - SetValidator(val); - - parent->AddChild(this); - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - - m_windowStyle = (long&)style; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; - - if ( majorDim == 0 ) - m_majorDim = n; - else - m_majorDim = majorDim; - m_noRowsOrCols = majorDim; - - long msStyle = GROUP_FLAGS; - - bool want3D; - WXDWORD exStyle = Determine3DEffects(0, &want3D); - - HWND hwndParent = (HWND)parent->GetHWND(); - - m_hWnd = (WXHWND)::CreateWindowEx - ( - (DWORD)exStyle, - GROUP_CLASS, - title, - msStyle, - 0, 0, 0, 0, - hwndParent, - (HMENU)m_windowId, - wxGetInstance(), - NULL - ); - -#if wxUSE_CTL3D - if (want3D) - { - Ctl3dSubclassCtl((HWND)m_hWnd); - m_useCtl3D = TRUE; - } -#endif // wxUSE_CTL3D +// ---------------------------------------------------------------------------- +// simple accessors +// ---------------------------------------------------------------------------- - SetFont(parent->GetFont()); +int wxRadioBox::GetCount() const +{ + return m_radioButtons->GetCount(); +} - SubclassWin(m_hWnd); +void wxRadioBox::SetString(int item, const wxString& label) +{ + wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") ); - // Some radio boxes test consecutive id. - (void)NewControlId(); - m_radioButtons = new WXHWND[n]; - m_radioWidth = new int[n]; - m_radioHeight = new int[n]; - int i; - for (i = 0; i < n; i++) - { - m_radioWidth[i] = m_radioHeight[i] = -1; - long groupStyle = 0; - if ( i == 0 && style == 0 ) - groupStyle = WS_GROUP; - long newId = NewControlId(); - long msStyle = groupStyle | RADIO_FLAGS; + m_radioWidth[item] = + m_radioHeight[item] = wxDefaultCoord; - HWND hwndBtn = CreateWindowEx(exStyle, RADIO_CLASS, - choices[i], msStyle, - 0,0,0,0, - hwndParent, - (HMENU)newId, wxGetInstance(), - NULL); + ::SetWindowText((*m_radioButtons)[item], label.c_str()); - m_radioButtons[i] = (WXHWND)hwndBtn; + InvalidateBestSize(); +} - SubclassRadioButton((WXHWND)hwndBtn); +void wxRadioBox::SetSelection(int N) +{ + wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") ); - wxFont& font = GetFont(); - if ( font.Ok() ) - { - SendMessage(hwndBtn, WM_SETFONT, - (WPARAM)font.GetResourceHandle(), 0L); - } + // unselect the old button + if ( m_selectedButton != wxNOT_FOUND ) + ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L); - m_subControls.Append((wxObject *)(WXDWORD)(WXWORD)newId); - } + // and select the new one + ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L); - // Create a dummy radio control to end the group. - (void)CreateWindowEx(0, RADIO_CLASS, wxT(""), WS_GROUP | RADIO_FLAGS, - 0, 0, 0, 0, hwndParent, - (HMENU)NewControlId(), wxGetInstance(), NULL); - - SetSelection(0); + m_selectedButton = N; +} - SetSize(x, y, width, height); +// Find string for position +wxString wxRadioBox::GetString(int item) const +{ + wxCHECK_MSG( IsValid(item), wxEmptyString, + wxT("invalid radiobox index") ); - return TRUE; + return wxGetWindowText((*m_radioButtons)[item]); } -wxRadioBox::~wxRadioBox() +void wxRadioBox::SetFocus() { - m_isBeingDeleted = TRUE; - - if (m_radioButtons) + if ( GetCount() > 0 ) { - int i; - for (i = 0; i < m_noItems; i++) - ::DestroyWindow((HWND)m_radioButtons[i]); - delete[] m_radioButtons; + ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND + ? 0 + : m_selectedButton]); } +} - if (m_radioWidth) - delete[] m_radioWidth; - if (m_radioHeight) - delete[] m_radioHeight; +// 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; } -wxString wxRadioBox::GetLabel(int item) const +bool wxRadioBox::IsItemEnabled(int item) const { - wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); + wxCHECK_MSG( IsValid(item), false, + wxT("invalid item in wxRadioBox::IsItemEnabled()") ); - return wxGetWindowText(m_radioButtons[item]); + return ::IsWindowEnabled((*m_radioButtons)[item]) != 0; } -void wxRadioBox::SetLabel(int item, const wxString& label) +// Show a specific button +bool wxRadioBox::Show(int item, bool show) { - wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); + wxCHECK_MSG( IsValid(item), false, + wxT("invalid item in wxRadioBox::Show()") ); + + BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE); - m_radioWidth[item] = m_radioHeight[item] = -1; - SetWindowText((HWND)m_radioButtons[item], label.c_str()); + bool changed = (ret != 0) != show; + if ( changed ) + { + InvalidateBestSize(); + } + + return changed; } -void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) +bool wxRadioBox::IsItemShown(int item) const { - /* - m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN; - m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN; - */ - wxFAIL_MSG(wxT("not implemented")); + 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; } -int wxRadioBox::FindString(const wxString& s) const +WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons) + +// ---------------------------------------------------------------------------- +// size calculations +// ---------------------------------------------------------------------------- + +wxSize wxRadioBox::GetMaxButtonSize() const { - for (int i = 0; i < m_noItems; i++) + // calculate the max button size + int widthMax = 0, + heightMax = 0; + const int count = GetCount(); + for ( int i = 0 ; i < count; i++ ) { - if ( s == wxGetWindowText(m_radioButtons[i]) ) - return i; + int width, height; + if ( m_radioWidth[i] < 0 ) + { + GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height); + + // adjust the size to take into account the radio box itself + // FIXME this is totally bogus! + width += RADIO_SIZE; + height *= 3; + height /= 2; + } + else + { + width = m_radioWidth[i]; + height = m_radioHeight[i]; + } + + if ( widthMax < width ) + widthMax = width; + if ( heightMax < height ) + heightMax = height; } - return wxNOT_FOUND; + return wxSize(widthMax, heightMax); } -void wxRadioBox::SetSelection(int N) +wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const { - wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); + // the radiobox should be big enough for its buttons + int cx1, cy1; + wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); - // 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); + int extraHeight = cy1; - ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); - ::SetFocus((HWND)m_radioButtons[N]); + int height = GetRowCount() * sizeBtn.y + cy1/2 + extraHeight; + int width = GetColumnCount() * (sizeBtn.x + cx1) + cx1; - m_selectedButton = N; -} + // Add extra space under the label, if it exists. + if (!wxControl::GetLabel().empty()) + height += cy1/2; -// Get single selection, for single choice list items -int wxRadioBox::GetSelection() const -{ - return m_selectedButton; + // and also wide enough for its label + int widthLabel; + GetTextExtent(wxStripMenuCodes(GetLabel()), &widthLabel, NULL); + widthLabel += RADIO_SIZE; // FIXME this is bogus too + if ( widthLabel > width ) + width = widthLabel; + + return wxSize(width, height); } -// Find string for position -wxString wxRadioBox::GetString(int N) const +wxSize wxRadioBox::DoGetBestSize() const { - return wxGetWindowText(m_radioButtons[N]); + wxSize best = GetTotalButtonSize(GetMaxButtonSize()); + CacheBestSize(best); + return best; } // Restored old code. @@ -359,115 +504,97 @@ 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; - wxString buf; - int y_offset = yy; int x_offset = xx; - int current_width, cyf; - int cx1,cy1; - wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont()); + int cx1, cy1; + 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. - int maxWidth = -1; - int maxHeight = -1; + wxSize maxSize = GetMaxButtonSize(); + int maxWidth = maxSize.x, + maxHeight = maxSize.y; + + wxSize totSize = GetTotalButtonSize(maxSize); + int totWidth = totSize.x, + totHeight = totSize.y; - int i; - for (i = 0 ; i < m_noItems; i++) + // only change our width/height if asked for + if ( width == wxDefaultCoord ) { - int eachWidth; - int eachHeight; - if (m_radioWidth[i]<0) - { - // It's a labelled toggle - buf = wxGetWindowText(m_radioButtons[i]); - GetTextExtent(buf, ¤t_width, &cyf); - eachWidth = (int)(current_width + RADIO_SIZE); - eachHeight = (int)((3*cyf)/2); - } + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + width = totWidth; else - { - eachWidth = m_radioWidth[i]; - eachHeight = m_radioHeight[i]; - } - - if (maxWidth= (count/GetMajorDim())*GetMajorDim(); + } + + // is this the start of new row/column? + if ( i && (i % GetMajorDim() == 0) ) + { + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { + // start of new column y_offset = startY; x_offset += maxWidth + cx1; } - else + else // start of new row { x_offset = startX; y_offset += maxHeight; @@ -475,310 +602,241 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) y_offset += cy1/2; } } - int eachWidth; - int eachHeight; - if (m_radioWidth[i]<0) + + int widthBtn; + if ( isLastInTheRow ) { - // It's a labeled item - buf = wxGetWindowText(m_radioButtons[i]); - GetTextExtent(buf, ¤t_width, &cyf); - - // How do we find out radio button bitmap size!! - // By adjusting them carefully, manually :-) - eachWidth = (int)(current_width + RADIO_SIZE); - eachHeight = (int)((3*cyf)/2); + // make the button go to the end of radio box + widthBtn = startX + width - x_offset - 2*cx1; + if ( widthBtn < maxWidth ) + widthBtn = maxWidth; } else { - eachWidth = m_radioWidth[i]; - eachHeight = m_radioHeight[i]; + // normal button, always of the same size + widthBtn = maxWidth; } - MoveWindow((HWND)m_radioButtons[i], x_offset, y_offset, - eachWidth, eachHeight, - TRUE); + // 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) + DoMoveSibling((*m_radioButtons)[i], x_offset, y_offset, widthBtn, maxHeight); - if (m_windowStyle & wxRA_SPECIFY_ROWS) + // where do we put the next button? + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { + // below this one y_offset += maxHeight; if (m_radioWidth[0]>0) y_offset += cy1/2; } else - x_offset += maxWidth + cx1; + { + // to the right of this one + x_offset += widthBtn + cx1; + } } } -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); +// ---------------------------------------------------------------------------- +// radio box drawing +// ---------------------------------------------------------------------------- - int i; - for (i = 0; i < m_noItems; i++) - wxFindMaxSize(m_radioButtons[i], &rect); +#ifndef __WXWINCE__ - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; -} - -void wxRadioBox::GetPosition(int *x, int *y) const +WXHRGN wxRadioBox::MSWGetRegionWithoutChildren() { - wxWindow *parent = GetParent(); - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -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; - } + RECT rc; + ::GetWindowRect(GetHwnd(), &rc); + HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); - *x = point.x; - *y = point.y; -} - -void wxRadioBox::SetFocus() -{ - if (m_noItems > 0) + const size_t count = GetCount(); + for ( size_t i = 0; i < count; ++i ) { - 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; + // don't clip out hidden children + if ( !IsItemShown(i) ) + continue; - int nCmdShow = show ? SW_SHOW : SW_HIDE; - for ( int i = 0; i < m_noItems; i++ ) - { - ::ShowWindow((HWND)m_radioButtons[i], nCmdShow); + ::GetWindowRect((*m_radioButtons)[i], &rc); + AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc)); + ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF); } - return TRUE; + return (WXHRGN)hrgn; } -// 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); +#endif // __WXWINCE__ - 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); -} +// --------------------------------------------------------------------------- +// window proc for radio buttons +// --------------------------------------------------------------------------- -WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) { -#if wxUSE_CTL3D - if ( m_useCtl3D ) + switch ( message ) { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; - } -#endif - - if (GetParent()->GetTransparentBackground()) - SetBkMode((HDC) pDC, TRANSPARENT); - else - SetBkMode((HDC) pDC, OPAQUE); + case WM_GETDLGCODE: + // we must tell IsDialogMessage()/our kbd processing code that we + // want to process arrows ourselves because neither of them is + // smart enough to handle arrows properly for us + { + long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, + message, wParam, lParam); - ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue())); - ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue())); + return lDlgCode | DLGC_WANTARROWS; + } - wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID); +#if wxUSE_TOOLTIPS + case WM_NOTIFY: + { + NMHDR* hdr = (NMHDR *)lParam; + if ( hdr->code == TTN_NEEDTEXT ) + { + wxRadioBox * + radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); - return (WXHBRUSH) backgroundBrush->GetResourceHandle(); -} + wxCHECK_MSG( radiobox, 0, + wxT("radio button without radio box?") ); -// For single selection items only -wxString wxRadioBox::GetStringSelection() const -{ - wxString result; - int sel = GetSelection(); - if (sel > -1) - result = GetString(sel); + wxToolTip *tooltip = radiobox->GetToolTip(); + if ( tooltip ) + { + TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam; + ttt->lpszText = (wxChar *)tooltip->GetTip().c_str(); + } - return result; -} + // processed + return 0; + } + } + break; +#endif // wxUSE_TOOLTIPS -bool wxRadioBox::SetStringSelection(const wxString& s) -{ - int sel = FindString (s); - if (sel > -1) - { - SetSelection (sel); - return TRUE; - } - else - return FALSE; -} + case WM_KEYDOWN: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); -bool wxRadioBox::ContainsHWND(WXHWND hWnd) const -{ - int i; - for (i = 0; i < Number(); i++) - { - if (GetRadioButtons()[i] == hWnd) - return TRUE; - } + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); - return FALSE; -} + bool processed = true; -void wxRadioBox::Command (wxCommandEvent & event) -{ - SetSelection (event.m_commandInt); - ProcessCommand (event); -} + wxDirection dir; + switch ( wParam ) + { + case VK_UP: + dir = wxUP; + break; -void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) -{ -#ifdef __WIN32__ - HWND hwndBtn = (HWND)hWndBtn; + case VK_LEFT: + dir = wxLEFT; + break; - if ( !s_wndprocRadioBtn ) - s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); + case VK_DOWN: + dir = wxDOWN; + break; - // No GWL_USERDATA in Win16, so omit this subclassing. - ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); - ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); -#endif // __WIN32__ -} + case VK_RIGHT: + dir = wxRIGHT; + break; -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); -} + default: + processed = false; -// --------------------------------------------------------------------------- -// window proc for radio buttons -// --------------------------------------------------------------------------- - -#ifdef __WIN32__ - -LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, - UINT msg, - WPARAM wParam, - LPARAM lParam) -{ - bool processed = TRUE; - if ( msg != WM_KEYDOWN ) - processed = FALSE; + // just to suppress the compiler warning + dir = wxALL; + } - if ( processed ) - { - wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA); + if ( processed ) + { + 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(); - wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + return 0; + } + } + } + break; - int sel = radiobox->GetSelection(); + case WM_SETFOCUS: + case WM_KILLFOCUS: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + // 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; - switch ( wParam ) - { - case VK_UP: - sel--; - break; +#ifndef __WXWINCE__ + case WM_HELP: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); - case VK_LEFT: - sel -= radiobox->GetNumVer(); - break; + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); - case VK_DOWN: - sel++; - break; + bool processed = false; - case VK_RIGHT: - sel += radiobox->GetNumVer(); - break; + wxEvtHandler * const handler = radiobox->GetEventHandler(); - case VK_TAB: + HELPINFO* info = (HELPINFO*) lParam; + if ( info->iContextType == HELPINFO_WINDOW ) { - wxNavigationKeyEvent event; - event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100)); - event.SetWindowChange(FALSE); - event.SetEventObject(radiobox); - - if ( radiobox->GetEventHandler()->ProcessEvent(event) ) - return 0; + 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, info->iCtrlId); + helpEvent.SetEventObject(radiobox); + processed = handler->ProcessEvent(helpEvent); } - // fall through - - default: - processed = FALSE; - } - - if ( processed ) - { - if ( sel >= 0 && sel < radiobox->Number() ) - { - radiobox->SetSelection(sel); - // emulate the button click - radiobox->SendNotificationEvent(); + if ( processed ) + return 0; } - } + break; +#endif // !__WXWINCE__ } - if ( !processed ) - return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam); - else - return 0; + return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); } -#endif // __WIN32__ - +#endif // wxUSE_RADIOBOX