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:
Julian Smart
1998-12-14 18:50:32 +00:00
parent 8b53e5a226
commit 72fd19a1fb
7 changed files with 28 additions and 5 deletions

View File

@@ -163,6 +163,13 @@ and the current brush for filling the shape.
The arc is drawn in an anticlockwise direction from the start point to the end point. The arc is drawn in an anticlockwise direction from the start point to the end point.
\membersection{wxDC::DrawBitmap}\label{wxdcdrawbitmap}
\func{void}{DrawBitmap}{\param{const wxBitmap\&}{ bitmap}, \param{long}{ x}, \param{long}{ y}, \param{bool}{ transparent}}
Draw a bitmap on the device context at the specified point. If {\it transparent} is TRUE and the bitmap has
a transparency mask, the bitmap will be drawn transparently.
\membersection{wxDC::DrawEllipse}\label{wxdcdrawellipse} \membersection{wxDC::DrawEllipse}\label{wxdcdrawellipse}
\func{void}{DrawEllipse}{\param{long}{ x}, \param{long}{ y}, \param{long}{ width}, \param{long}{ height}} \func{void}{DrawEllipse}{\param{long}{ x}, \param{long}{ y}, \param{long}{ width}, \param{long}{ height}}

View File

@@ -500,6 +500,8 @@ Writes the database as a LISP-format file.
\func{bool}{Write}{\param{ostream\& }{stream}} \func{bool}{Write}{\param{ostream\& }{stream}}
\func{bool}{Write}{\param{const wxString\&}{ filename}}
Writes the database as a Prolog-format file. Writes the database as a Prolog-format file.

View File

@@ -25,7 +25,7 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#ifdef __WXGTK__ #if defined(__WXGTK__) || defined(__WXMOTIF__)
#include "mondrian.xpm" #include "mondrian.xpm"
#endif #endif

Binary file not shown.

View File

@@ -150,10 +150,10 @@ void wxRadioButton::SetValue(bool value)
SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L); SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L);
} }
// Get single selection, for single choice list items // Get single selection
bool wxRadioButton::GetValue(void) const 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, WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

View File

@@ -278,6 +278,16 @@ unsigned long wxThread::GetID() const
return (unsigned long)p_internal->tid; 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() bool wxThread::IsMain()
{ {
return (GetCurrentThread() == p_mainid); return (GetCurrentThread() == p_mainid);

View File

@@ -616,6 +616,12 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
{ {
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
int currentW,currentH;
GetSize(&currentW, &currentH);
if (x == currentX && y == currentY && width == currentW && height == currentH)
return;
int actualWidth = width; int actualWidth = width;
int actualHeight = height; int actualHeight = height;
int actualX = x; int actualX = x;
@@ -627,8 +633,6 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
AdjustForParentClientOrigin(actualX, actualY, sizeFlags); AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
int currentW,currentH;
GetSize(&currentW, &currentH);
if (width == -1) if (width == -1)
actualWidth = currentW ; actualWidth = currentW ;
if (height == -1) if (height == -1)