X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ad6ad991c39081d513f7d277bd3509fbbaa42fc..1e52188741389278cd99abf79218162c87024ba3:/src/msw/radiobox.cpp?ds=inline diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index f91948a2db..19ae0e3b05 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp -// Purpose: wxRadioBox +// Name: 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,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif @@ -28,24 +28,35 @@ #pragma hdrstop #endif +#if wxUSE_RADIOBOX + #ifndef WX_PRECOMP #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 wxUSE_TOOLTIPS -// #ifndef __GNUWIN32__ + #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) #include -// #endif + #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) +/* + selection + content + label + dimension + 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 @@ -85,7 +96,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, // --------------------------------------------------------------------------- // the pointer to standard radio button wnd proc -static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL; +static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL; #endif // __WIN32__ @@ -97,6 +108,22 @@ static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL; // wxRadioBox // --------------------------------------------------------------------------- +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 ) @@ -109,6 +136,7 @@ int wxRadioBox::GetNumVer() const } } +// returns the number of columns int wxRadioBox::GetNumHor() const { if ( m_windowStyle & wxRA_SPECIFY_ROWS ) @@ -125,6 +153,9 @@ 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++ ) @@ -137,7 +168,14 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) } } - wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") ); + 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 ) { @@ -153,22 +191,6 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) 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() { @@ -197,7 +219,7 @@ bool wxRadioBox::Create(wxWindow *parent, m_selectedButton = -1; m_noItems = 0; - m_majorDim = majorDim == 0 ? n : majorDim; + m_majorDim = majorDim == 0 ? n : majorDim; m_noRowsOrCols = majorDim; // common initialization @@ -251,7 +273,7 @@ bool wxRadioBox::Create(wxWindow *parent, if ( !hwndBtn ) { - wxLogLastError("CreateWindow(radio btn)"); + wxLogLastError(wxT("CreateWindow(radio btn)")); return FALSE; } @@ -270,7 +292,7 @@ bool wxRadioBox::Create(wxWindow *parent, // 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, (HMENU)NewControlId(), wxGetInstance(), NULL); @@ -301,14 +323,7 @@ wxRadioBox::~wxRadioBox() } -wxString wxRadioBox::GetLabel(int item) const -{ - wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); - - return wxGetWindowText(m_radioButtons[item]); -} - -void wxRadioBox::SetLabel(int item, const wxString& label) +void wxRadioBox::SetString(int item, const wxString& label) { wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); @@ -316,26 +331,6 @@ void wxRadioBox::SetLabel(int item, const wxString& label) SetWindowText((HWND)m_radioButtons[item], label.c_str()); } -void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) -{ - /* - m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN; - m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN; - */ - wxFAIL_MSG(wxT("not implemented")); -} - -int wxRadioBox::FindString(const wxString& s) const -{ - for (int i = 0; i < m_noItems; i++) - { - if ( s == wxGetWindowText(m_radioButtons[i]) ) - return i; - } - - return wxNOT_FOUND; -} - void wxRadioBox::SetSelection(int N) { wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); @@ -345,7 +340,6 @@ void wxRadioBox::SetSelection(int N) ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L); ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); - ::SetFocus((HWND)m_radioButtons[N]); m_selectedButton = N; } @@ -357,9 +351,87 @@ int wxRadioBox::GetSelection() const } // Find string for position -wxString wxRadioBox::GetString(int N) const +wxString wxRadioBox::GetString(int item) const +{ + wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString, + wxT("invalid radiobox index") ); + + return wxGetWindowText(m_radioButtons[item]); +} + +// ---------------------------------------------------------------------------- +// size calculations +// ---------------------------------------------------------------------------- + +wxSize wxRadioBox::GetMaxButtonSize() const +{ + // calculate the max button size + int widthMax = 0, + heightMax = 0; + for ( int i = 0 ; i < m_noItems; 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 wxSize(widthMax, heightMax); +} + +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()); + + 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()) + height += cy1/2; + + // and also wide enough for its label + int widthLabel; + GetTextExtent(GetTitle(), &widthLabel, NULL); + widthLabel += RADIO_SIZE; // FIXME this is bogus too + if ( widthLabel > width ) + width = widthLabel; + + return wxSize(width, height); +} + +wxSize wxRadioBox::DoGetBestSize() const { - return wxGetWindowText(m_radioButtons[N]); + return GetTotalButtonSize(GetMaxButtonSize()); } // Restored old code. @@ -386,106 +458,88 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) int x_offset = xx; #endif - int current_width, cyf; - - int cx1,cy1; + 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; - int i; - for (i = 0 ; i < m_noItems; i++) + wxSize totSize = GetTotalButtonSize(maxSize); + int totWidth = totSize.x, + totHeight = totSize.y; + + // only change our width/height if asked for + if ( width == -1 ) { - int eachWidth; - int eachHeight; - if (m_radioWidth[i]<0) - { - // It's a labelled toggle - GetTextExtent(wxGetWindowText(m_radioButtons[i]), - ¤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= (m_noItems/m_majorDim)*m_majorDim; + } + + // is this the start of new row/column? + if ( i && (i % m_majorDim == 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; @@ -493,23 +547,19 @@ 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 - GetTextExtent(wxGetWindowText(m_radioButtons[i]), - ¤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; } // VZ: make all buttons of the same, maximal size - like this they @@ -517,17 +567,22 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) // shown (otherwise they are not when the mouse pointer is in the // radiobox part not belonging to any radiobutton) ::MoveWindow((HWND)m_radioButtons[i], - x_offset, y_offset, maxWidth, maxHeight, + x_offset, y_offset, widthBtn, maxHeight, TRUE); - 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; + } } } @@ -586,10 +641,9 @@ void wxRadioBox::SetFocus() { if (m_noItems > 0) { - if (m_selectedButton == -1) - ::SetFocus((HWND) m_radioButtons[0]); - else - ::SetFocus((HWND) m_radioButtons[m_selectedButton]); + ::SetFocus((HWND)m_radioButtons[m_selectedButton == -1 + ? 0 + : m_selectedButton]); } } @@ -638,35 +692,12 @@ void wxRadioBox::Show(int item, bool 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++) + size_t count = GetCount(); + for ( size_t i = 0; i < count; i++ ) { - if (GetRadioButtons()[i] == hWnd) + if ( GetRadioButtons()[i] == hWnd ) return TRUE; } @@ -676,6 +707,7 @@ bool wxRadioBox::ContainsHWND(WXHWND hWnd) const void wxRadioBox::Command(wxCommandEvent & event) { SetSelection (event.m_commandInt); + SetFocus(); ProcessCommand (event); } @@ -683,16 +715,13 @@ void wxRadioBox::Command(wxCommandEvent & event) // 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 = (WNDPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); + s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); -#endif // __WIN32__ } void wxRadioBox::SendNotificationEvent() @@ -716,11 +745,12 @@ bool wxRadioBox::SetFont(const wxFont& font) WXHFONT hfont = wxFont(font).GetResourceHandle(); for ( int n = 0; n < m_noItems; n++ ) { - ::SendMessage((HWND)m_radioButtons[n], WM_SETFONT, (WPARAM)hfont, 0L); - } + HWND hwndBtn = (HWND)m_radioButtons[n]; + ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L); - // this is needed because otherwise the buttons are not redrawn correctly - Refresh(); + // otherwise the buttons are not redrawn correctly + ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */); + } return TRUE; } @@ -749,6 +779,10 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) } #endif // Win32 + // VZ: this code breaks radiobox redrawing under Windows XP, don't use + // it. If you need to get messages from the static controls, + // create them as a child of another (non static) window +#if 0 // This is required for the radiobox to be sensitive to mouse input, // e.g. for Dialog Editor. case WM_NCHITTEST: @@ -764,11 +798,47 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) return (long)HTCLIENT; } break; +#endif // 0 } return wxControl::MSWWindowProc(nMsg, wParam, lParam); } +WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), +#if wxUSE_CTL3D + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam +#else + WXUINT WXUNUSED(message), + WXWPARAM WXUNUSED(wParam), + WXLPARAM WXUNUSED(lParam) +#endif + ) +{ +#if wxUSE_CTL3D + if ( m_useCtl3D ) + { + HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); + return (WXHBRUSH) hbrush; + } +#endif // wxUSE_CTL3D + + HDC hdc = (HDC)pDC; + wxColour colBack = GetBackgroundColour(); + + if (!IsEnabled()) + colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + + ::SetBkColor(hdc, wxColourToRGB(colBack)); + ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + + return (WXHBRUSH)brush->GetResourceHandle(); +} + + // --------------------------------------------------------------------------- // window proc for radio buttons // --------------------------------------------------------------------------- @@ -789,7 +859,6 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, { long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); - //CallWindowProc(CASTWNDPROC gs_wndprocToolTip, hwndTT, msg, wParam, lParam); return lDlgCode | DLGC_WANTARROWS; } @@ -798,7 +867,7 @@ 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); @@ -829,41 +898,46 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, bool processed = TRUE; - int selOld = radiobox->GetSelection(); - int selNew = selOld; - + wxDirection dir; switch ( wParam ) { case VK_UP: - selNew--; + dir = wxUP; break; case VK_LEFT: - selNew -= radiobox->GetNumVer(); + dir = wxLEFT; break; case VK_DOWN: - selNew++; + dir = wxDOWN; break; case VK_RIGHT: - selNew += radiobox->GetNumVer(); + dir = wxRIGHT; break; default: processed = FALSE; + + // just to suppress the compiler warning + dir = wxALL; } if ( processed ) { - // ensure that selNew is in range [0..num) - int num = radiobox->Number(); - selNew += num; - selNew %= num; + 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(); @@ -872,12 +946,65 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, } } } + break; + +#ifdef __WIN32__ + case WM_HELP: + { + wxRadioBox *radiobox = (wxRadioBox *) + ::GetWindowLong(hwnd, GWL_USERDATA); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + bool processed = TRUE; + + // 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 + { + wxWindow* subjectOfHelp = radiobox; + bool eventProcessed = FALSE; + while (subjectOfHelp && !eventProcessed) + { + wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), +#ifdef __WXWINCE__ + wxPoint(0, 0) +#else + wxPoint(info->MousePos.x, info->MousePos.y) +#endif + ) ; // 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 = eventProcessed; + } +#ifndef __WXWINCE__ + else if (info->iContextType == HELPINFO_MENUITEM) + { + wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ; + helpEvent.SetEventObject(radiobox); + processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent); + } + else + processed = FALSE; +#endif + if (processed) + return 0; + + break; + } +#endif // __WIN32__ } return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); - - } #endif // __WIN32__ +#endif // wxUSE_RADIOBOX