Fixed bug that was giving the wrong size of wxCustomDataObjects to the receiver.

[wxWidgets.git] / src / msw / radiobut.cpp

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index 8f7c9786be2ab5a08a7f3651f034b5492bd902d0..261af8c3d36d42b28691227dfced53cfe4616f0e 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -24,15 +24,14 @@
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/radiobut.h"
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/radiobut.h"

+#include "wx/settings.h"

 #include "wx/brush.h"
 #endif
 
 #include "wx/msw/private.h"
 
 #include "wx/brush.h"
 #endif
 
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 // IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 // IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)

-#endif

 
 bool wxRadioButton::MSWCommand(WXUINT param, WXWORD id)
 {
 
 bool wxRadioButton::MSWCommand(WXUINT param, WXWORD id)
 {


@@ -40,6 +39,7 @@ bool wxRadioButton::MSWCommand(WXUINT param, WXWORD id)
   {
     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId);
     event.SetEventObject( this );
   {
     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId);
     event.SetEventObject( this );

+    event.SetInt( GetValue() );

     ProcessCommand(event);
     return TRUE;
   }
     ProcessCommand(event);
     return TRUE;
   }


@@ -54,7 +54,9 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
   SetName(name);
            const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   if (parent) parent->AddChild(this);
 
 
   if (parent) parent->AddChild(this);
 


@@ -78,7 +80,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     groupStyle = WS_GROUP;
 
 //  long msStyle = groupStyle | RADIO_FLAGS;
     groupStyle = WS_GROUP;
 
 //  long msStyle = groupStyle | RADIO_FLAGS;

-  long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ;
+  long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;

 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;


@@ -94,7 +96,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                           msStyle,0,0,0,0,
                           (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
 
                           msStyle,0,0,0,0,
                           (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
 

-  wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create radiobutton") );
+  wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create radiobutton") );

 
 #if wxUSE_CTL3D
   if (want3D)
 
 #if wxUSE_CTL3D
   if (want3D)


@@ -112,7 +114,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 //  SetValue(value);
 
   // start GRW fix
 //  SetValue(value);
 
   // start GRW fix

-  if (label != _T(""))
+  if (label != wxT(""))

   {
     int label_width, label_height;
     GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont());
   {
     int label_width, label_height;
     GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont());


@@ -136,6 +138,13 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
   SetSize(x, y, width, height);
 
 
   SetSize(x, y, width, height);
 

+  // for compatibility with wxGTK, the first radio button in a group is
+  // always checked (this makes sense anyhow as you need to ensure that at
+  // least one button in the group is checked and this is the simlpest way to
+  // do it)
+  if ( m_windowStyle & wxRB_GROUP )
+      SetValue(TRUE);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -157,39 +166,43 @@ bool wxRadioButton::GetValue(void) const
   return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L) != 0);
 }
 
   return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L) != 0);
 }
 

+void wxRadioButton::Command (wxCommandEvent & event)
+{
+  SetValue ( (event.m_commandInt != 0) );
+  ProcessCommand (event);
+}
+

 WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+                               WXUINT message,
+                               WXWPARAM wParam,
+                               WXLPARAM lParam)

 {
 #if wxUSE_CTL3D
 {
 #if wxUSE_CTL3D

-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-    return (WXHBRUSH) hbrush;
-  }
-#endif
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }
+#endif // wxUSE_CTL3D

 
 

-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
+    HDC hdc = (HDC)pDC;
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode(hdc, TRANSPARENT);
+    else
+        SetBkMode(hdc, OPAQUE);

 
 

-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    wxColour colBack = GetBackgroundColour();

 
 

-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    if (!IsEnabled())
+        colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);

 
 

-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));

 
 

-void wxRadioButton::Command (wxCommandEvent & event)
-{
-  SetValue ( (event.m_commandInt != 0) );
-  ProcessCommand (event);
-}
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);

 
 

+    return (WXHBRUSH)brush->GetResourceHandle();
+}

 
 // Not implemented
 #if 0
 
 // Not implemented
 #if 0