X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dab049c9e46d2c484c384679a656b46d0e4f513..63effd42eaaea3594e18fd7b91372842107978cf:/src/msw/radiobox.cpp diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index d0f6c2b18f..877146bb80 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -60,21 +60,21 @@ wxBEGIN_FLAGS( wxRadioBoxStyle ) 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(wxNO_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(wxNO_FULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) wxFLAGS_MEMBER(wxVSCROLL) wxFLAGS_MEMBER(wxHSCROLL) @@ -98,11 +98,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) #endif /* - selection - content - label - dimension - item + selection + content + label + dimension + item */ // there are two possible ways to create the radio buttons: either as children @@ -202,9 +202,9 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) if ( cmd == BN_CLICKED ) { if (id == GetId()) - return TRUE; + return true; - int selectedButton = -1; + int selectedButton = wxID_ANY; for ( int i = 0; i < m_noItems; i++ ) { @@ -216,13 +216,13 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) } } - if ( selectedButton == -1 ) + 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; + return false; } if ( selectedButton != m_selectedButton ) @@ -233,16 +233,16 @@ 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; } // Radio box item wxRadioBox::wxRadioBox() { - m_selectedButton = -1; + m_selectedButton = wxID_ANY; m_noItems = 0; m_noRowsOrCols = 0; m_radioButtons = NULL; @@ -264,7 +264,7 @@ bool wxRadioBox::Create(wxWindow *parent, const wxString& name) { // initialize members - m_selectedButton = -1; + m_selectedButton = wxID_ANY; m_noItems = 0; m_majorDim = majorDim == 0 ? n : majorDim; @@ -272,12 +272,12 @@ bool wxRadioBox::Create(wxWindow *parent, // common initialization if ( !CreateControl(parent, id, pos, size, style, val, name) ) - return FALSE; + return false; // create the static box if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP, pos, size, title, 0) ) - return FALSE; + return false; // and now create the buttons m_noItems = n; @@ -294,7 +294,7 @@ bool wxRadioBox::Create(wxWindow *parent, m_radioHeight = new int[n]; WXHFONT hfont = 0; - wxFont& font = GetFont(); + wxFont font = GetFont(); if ( font.Ok() ) { hfont = font.GetResourceHandle(); @@ -303,7 +303,7 @@ bool wxRadioBox::Create(wxWindow *parent, 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 ) styleBtn |= WS_GROUP; @@ -323,7 +323,7 @@ bool wxRadioBox::Create(wxWindow *parent, { wxLogLastError(wxT("CreateWindow(radio btn)")); - return FALSE; + return false; } m_radioButtons[i] = (WXHWND)hwndBtn; @@ -345,16 +345,39 @@ bool wxRadioBox::Create(wxWindow *parent, 0, 0, 0, 0, hwndParent, (HMENU)NewControlId(), wxGetInstance(), NULL); - SetSelection(0); +#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) { @@ -375,7 +398,7 @@ void wxRadioBox::SetString(int item, const wxString& label) { wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); - m_radioWidth[item] = m_radioHeight[item] = -1; + m_radioWidth[item] = m_radioHeight[item] = wxDefaultCoord; SetWindowText((HWND)m_radioButtons[item], label.c_str()); } @@ -448,7 +471,7 @@ 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; @@ -459,7 +482,7 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const extraHeight /= 2; #endif */ - + int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight; int width = GetNumHor() * (sizeBtn.x + cx1) + cx1; @@ -493,9 +516,9 @@ 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 @@ -507,7 +530,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) #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. @@ -520,7 +543,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; @@ -528,7 +551,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; @@ -636,8 +659,7 @@ 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; + RECT rect = { -1, -1, -1, -1 }; if (m_hWnd) wxFindMaxSize(m_hWnd, &rect); @@ -689,7 +711,7 @@ void wxRadioBox::SetFocus() { if (m_noItems > 0) { - ::SetFocus((HWND)m_radioButtons[m_selectedButton == -1 + ::SetFocus((HWND)m_radioButtons[m_selectedButton == wxID_ANY ? 0 : m_selectedButton]); } @@ -699,7 +721,7 @@ void wxRadioBox::SetFocus() bool wxRadioBox::Show(bool show) { if ( !wxControl::Show(show) ) - return FALSE; + return false; int nCmdShow = show ? SW_SHOW : SW_HIDE; for ( int i = 0; i < m_noItems; i++ ) @@ -707,7 +729,7 @@ bool wxRadioBox::Show(bool show) ::ShowWindow((HWND)m_radioButtons[i], nCmdShow); } - return TRUE; + return true; } // Enable a specific button @@ -723,12 +745,12 @@ void wxRadioBox::Enable(int item, bool enable) bool wxRadioBox::Enable(bool enable) { if ( !wxControl::Enable(enable) ) - return FALSE; + return false; for (int i = 0; i < m_noItems; i++) ::EnableWindow((HWND) m_radioButtons[i], enable); - return TRUE; + return true; } // Show a specific button @@ -746,10 +768,10 @@ bool wxRadioBox::ContainsHWND(WXHWND hWnd) const for ( size_t i = 0; i < count; i++ ) { if ( GetRadioButtons()[i] == hWnd ) - return TRUE; + return true; } - return FALSE; + return false; } void wxRadioBox::Command(wxCommandEvent & event) @@ -766,10 +788,10 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) HWND hwndBtn = (HWND)hWndBtn; if ( !s_wndprocRadioBtn ) - s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); + s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn); - ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); - ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); + wxSetWindowProc(hwndBtn, wxRadioBtnWndProc); + wxSetWindowUserData(hwndBtn, this); } void wxRadioBox::SendNotificationEvent() @@ -786,7 +808,7 @@ bool wxRadioBox::SetFont(const wxFont& font) if ( !wxControl::SetFont(font) ) { // nothing to do - return FALSE; + return false; } // also set the font of our radio buttons @@ -800,14 +822,14 @@ bool wxRadioBox::SetFont(const wxFont& font) ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- // our window proc // ---------------------------------------------------------------------------- -long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { switch ( nMsg ) { @@ -823,7 +845,7 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); - return (WXHBRUSH)brush->GetResourceHandle(); + return (WXLRESULT)brush->GetResourceHandle(); } #endif // Win32 @@ -875,9 +897,6 @@ WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE HDC hdc = (HDC)pDC; wxColour colBack = GetBackgroundColour(); - if (!IsEnabled()) - colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - ::SetBkColor(hdc, wxColourToRGB(colBack)); ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); @@ -917,8 +936,8 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, NMHDR* hdr = (NMHDR *)lParam; 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?") ); @@ -939,12 +958,11 @@ 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 processed = true; wxDirection dir; switch ( wParam ) @@ -966,7 +984,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, break; default: - processed = FALSE; + processed = false; // just to suppress the compiler warning dir = wxALL; @@ -999,8 +1017,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, case WM_SETFOCUS: case WM_KILLFOCUS: { - wxRadioBox *radiobox = (wxRadioBox *) - ::GetWindowLong(hwnd, GWL_USERDATA); + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); @@ -1018,12 +1035,11 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, #ifdef __WIN32__ case WM_HELP: { - 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 processed wxDUMMY_INITIALIZE(true); // HELPINFO doesn't seem to be supported on WinCE. #ifndef __WXWINCE__ @@ -1033,7 +1049,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, #endif { wxWindow* subjectOfHelp = radiobox; - bool eventProcessed = FALSE; + bool eventProcessed = false; while (subjectOfHelp && !eventProcessed) { wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), @@ -1059,7 +1075,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent); } else - processed = FALSE; + processed = false; #endif if (processed) return 0;