Various; wxRadioButton::GetValue corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index eddddcd335a17dc789f41f309e39d9697dbd8be9..ecbf200c0bffc6bd0b08bb802f6e646e8fe5bb58 100644 (file)
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -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}
 
 \func{void}{DrawEllipse}{\param{long}{ x}, \param{long}{ y}, \param{long}{ width}, \param{long}{ height}}
 \membersection{wxDC::DrawEllipse}\label{wxdcdrawellipse}
 
 \func{void}{DrawEllipse}{\param{long}{ x}, \param{long}{ y}, \param{long}{ width}, \param{long}{ height}}

diff --git a/docs/latex/wx/expr.tex b/docs/latex/wx/expr.tex
index b6fd3020a4338e6b4726d917da9ab8469097c2f3..c01a8ece6363ffc0e56f86374a9fb91e86fbd38f 100644 (file)
--- a/docs/latex/wx/expr.tex
+++ b/docs/latex/wx/expr.tex
@@ -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.
 
 

diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index 3bf016f19fcea7af6b7c19b2815fc4e1deaf9fe6..44b4d0188c50fdba267515a710fa337b35501e2b 100644 (file)
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -25,7 +25,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 975b6b17022f659aa1186e7da41d16546aba8c4e..7f3d6e20267761f082a976e7546a8878ada6b82e 100644 (file)
Binary files a/samples/minifram/Makefile.in and b/samples/minifram/Makefile.in differ

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index 32bd65e9b82185328a727016e6e69ede5feb7f22..de90c0ad7b62a96988d53ccc6b283bd3c4419d39 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -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,

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index a592fbf29ec0740e73d4556b0aec85195f6ae230..6ca57c6ce33b549ec02fbe55178557482606f125 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -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()
 {
   return (GetCurrentThread() == p_mainid);
 bool wxThread::IsMain()
 {
   return (GetCurrentThread() == p_mainid);

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 68cf6d87c2f01ac6932360d03aeef37a0527e31a..6a20945ba862b475f5996fc2d84022c9c925d31a 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -616,6 +616,12 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
 {
     int 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 actualHeight = height;
     int actualX = x;
     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);
 
 
     AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
 

-    int currentW,currentH;
-    GetSize(&currentW, &currentH);

     if (width == -1)
         actualWidth = currentW ;
     if (height == -1)
     if (width == -1)
         actualWidth = currentW ;
     if (height == -1)