Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied Patch #1390457 (Incorrect wxRadioBox widths & heights).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2005-12-27 11:20:46 +00:00
parent 3c115835b3
commit 4b2bdce665
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/os2/radiobox.cpp
View File

@@ -194,7 +194,7 @@ void wxRadioBox::AdjustButtons( int nX,
// Make all buttons of the same, maximal size - like this they // Make all buttons of the same, maximal size - like this they
// cover the radiobox entirely and the radiobox tooltips are always // cover the radiobox entirely and the radiobox tooltips are always
// shown (otherwise they are not when the mouse pointer is in the // shown (otherwise they are not when the mouse pointer is in the
// radiobox part not beYInt32ing to any radiobutton) // radiobox part not belonging to any radiobutton)
// //
::WinSetWindowPos( (HWND)m_ahRadioButtons[i] ::WinSetWindowPos( (HWND)m_ahRadioButtons[i]
,HWND_TOP ,HWND_TOP
@@ -290,9 +290,6 @@ bool wxRadioBox::Create(
m_nSelectedButton = -1; m_nSelectedButton = -1;
m_nNoItems = 0; m_nNoItems = 0;
SetMajorDim(nMajorDim == 0 ? nNum : nMajorDim, lStyle);
m_nNoRowsOrCols = nMajorDim;
// //
// Common initialization // Common initialization
// //
@@ -316,9 +313,15 @@ bool wxRadioBox::Create(
wxAssociateWinWithHandle(m_hWnd, this); wxAssociateWinWithHandle(m_hWnd, this);
// //
// Some radio boxes test consecutive id. // Now we can set m_nNoItems and let SetMajorDim set m_numCols/m_numRows
// //
m_nNoItems = nNum; m_nNoItems = nNum;
SetMajorDim(nMajorDim == 0 ? nNum : nMajorDim, lStyle);
m_nNoRowsOrCols = nMajorDim;
//
// Some radio boxes test consecutive id.
//
(void)NewControlId(); (void)NewControlId();
m_ahRadioButtons = new WXHWND[nNum]; m_ahRadioButtons = new WXHWND[nNum];
m_pnRadioWidth = new int[nNum]; m_pnRadioWidth = new int[nNum];
@@ -633,7 +636,7 @@ void wxRadioBox::DoSetSize(
// Make all buttons of the same, maximal size - like this they // Make all buttons of the same, maximal size - like this they
// cover the radiobox entirely and the radiobox tooltips are always // cover the radiobox entirely and the radiobox tooltips are always
// shown (otherwise they are not when the mouse pointer is in the // shown (otherwise they are not when the mouse pointer is in the
// radiobox part not beinting to any radiobutton) // radiobox part not belonging to any radiobutton)
// //
::WinSetWindowPos( (HWND)m_ahRadioButtons[i] ::WinSetWindowPos( (HWND)m_ahRadioButtons[i]
,HWND_TOP ,HWND_TOP
@@ -737,7 +740,7 @@ wxSize wxRadioBox::GetMaxButtonSize() const
} // end of wxRadioBox::GetMaxButtonSize } // end of wxRadioBox::GetMaxButtonSize
void wxRadioBox::GetPosition( int* pnX, void wxRadioBox::GetPosition( int* pnX,
int* WXUNUSED(pnY) ) const int* pnY ) const
{ {
wxWindowOS2* pParent = GetParent(); wxWindowOS2* pParent = GetParent();
RECT vRect = { -1, -1, -1, -1 }; RECT vRect = { -1, -1, -1, -1 };
@@ -779,8 +782,10 @@ void wxRadioBox::GetPosition( int* pnX,
vPoint.x = vPt.x; vPoint.x = vPt.x;
vPoint.y = vPt.y; vPoint.y = vPt.y;
} }
*pnX = vPoint.x; if (pnX)
*pnX = vPoint.y; *pnX = vPoint.x;
if (pnY)
*pnY = vPoint.y;
} // end of wxRadioBox::GetPosition } // end of wxRadioBox::GetPosition
// Get single selection, for single choice list items // Get single selection, for single choice list items