Fixed three mouse event bugs

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

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index a9957ebc0524443173928d348753f3835b5ebc55..32bd65e9b82185328a727016e6e69ede5feb7f22 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -33,6 +33,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 // IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
 #endif
 
 // IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
 #endif
 

+bool wxRadioButton::MSWCommand(WXUINT param, WXWORD id)
+{
+  if (param == BN_CLICKED)
+  {
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId);
+    event.SetEventObject( this );
+    ProcessCommand(event);
+    return TRUE;
+  }
+  else return FALSE;
+}
+

 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        const wxString& label,
            const wxPoint& pos,
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        const wxString& label,
            const wxPoint& pos,


@@ -72,8 +84,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

+/*

   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;
   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;

+*/

 
   m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const char *)label,
                           msStyle,0,0,0,0,
 
   m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const char *)label,
                           msStyle,0,0,0,0,


@@ -89,7 +103,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
   }
 #endif
 
   }
 #endif
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)m_hWnd);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)m_hWnd);


@@ -100,7 +114,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
   if (label != "")
   {
     int label_width, label_height;
   if (label != "")
   {
     int label_width, label_height;

-    GetTextExtent(label, &label_width, &label_height, NULL, NULL, GetFont());
+    GetTextExtent(label, &label_width, &label_height, NULL, NULL, & GetFont());

     if (width < 0)
       width = (int)(label_width + RADIO_SIZE);
     if (height<0)
     if (width < 0)
       width = (int)(label_width + RADIO_SIZE);
     if (height<0)