Various; wxRadioButton::GetValue corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -150,10 +150,10 @@ void wxRadioButton::SetValue(bool value)
|
||||
SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L);
|
||||
}
|
||||
|
||||
// Get single selection, for single choice list items
|
||||
// Get single selection
|
||||
bool wxRadioButton::GetValue(void) const
|
||||
{
|
||||
return (SendMessage((HWND) GetHWND(), BM_SETCHECK, 0, 0L) != 0);
|
||||
return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L) != 0);
|
||||
}
|
||||
|
||||
WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
|
||||
|
@@ -278,6 +278,16 @@ unsigned long wxThread::GetID() const
|
||||
return (unsigned long)p_internal->tid;
|
||||
}
|
||||
|
||||
bool wxThread::IsRunning() const
|
||||
{
|
||||
return (p_internal->state == STATE_RUNNING);
|
||||
}
|
||||
|
||||
bool wxThread::IsAlive() const
|
||||
{
|
||||
return (p_internal->state == STATE_RUNNING);
|
||||
}
|
||||
|
||||
bool wxThread::IsMain()
|
||||
{
|
||||
return (GetCurrentThread() == p_mainid);
|
||||
|
@@ -616,6 +616,12 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
|
||||
{
|
||||
int currentX, currentY;
|
||||
GetPosition(¤tX, ¤tY);
|
||||
int currentW,currentH;
|
||||
GetSize(¤tW, ¤tH);
|
||||
|
||||
if (x == currentX && y == currentY && width == currentW && height == currentH)
|
||||
return;
|
||||
|
||||
int actualWidth = width;
|
||||
int actualHeight = height;
|
||||
int actualX = x;
|
||||
@@ -627,8 +633,6 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
|
||||
|
||||
AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
|
||||
|
||||
int currentW,currentH;
|
||||
GetSize(¤tW, ¤tH);
|
||||
if (width == -1)
|
||||
actualWidth = currentW ;
|
||||
if (height == -1)
|
||||
|
Reference in New Issue
Block a user