]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/radiobut.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more MS-DOS stuff in generic wxFileDialog
[wxWidgets.git] / src / os2 / radiobut.cpp
diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index d0b290c9978482c9208c851495527b798325e4f8..83444cd1f0fa7f0f6cc09accff9eb0bb63269e32 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -27,197 +27,162 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
-bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
+void wxRadioButton::Command (
+  wxCommandEvent&                   rEvent
+)
 {
 {
-  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,
-           const wxSize& size, long style,
+    SetValue ((rEvent.GetInt() != 0) );
+    ProcessCommand (rEvent);
+} // end of wxRadioButton::Command
+
+bool wxRadioButton::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxString&                   rsLabel
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lStyle
 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS
-           const wxValidator& validator,
+, const wxValidator&                rValidator
 #endif
 #endif
-           const wxString& name)
+, const wxString&                   rsName
+)
 {
 {
-    SetName(name);
+    int                             nX          = rPos.x;
+    int                             nY          = rPos.y;
+    int                             nWidth      = rSize.x;
+    int                             nHeight     = rSize.y;
+    long                            lsStyle     = 0L;
+    long                            lGroupStyle = 0L;
+
+    SetName(rsName);
 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS
-    SetValidator(validator);
+    SetValidator(rValidator);
 #endif
 
 #endif
 
-    if (parent) parent->AddChild(this);
+    if (pParent)
+        pParent->AddChild(this);
 
 
-    SetBackgroundColour(parent->GetBackgroundColour());
-    SetForegroundColour(parent->GetForegroundColour());
+    SetBackgroundColour(pParent->GetBackgroundColour());
+    SetForegroundColour(pParent->GetForegroundColour());
 
 
-    if ( id == -1 )
+    if (vId == -1)
         m_windowId = (int)NewControlId();
     else
         m_windowId = (int)NewControlId();
     else
-        m_windowId = id;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-
-    m_windowStyle = style ;
-
-// TODO create radiobutton
-/*
-  long groupStyle = 0;
-  if (m_windowStyle & wxRB_GROUP)
-    groupStyle = WS_GROUP;
-
-//  long msStyle = groupStyle | RADIO_FLAGS;
-  long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ;
-
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-
-  m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const wxChar *)label,
-                          msStyle,0,0,0,0,
-                          (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
-
-  wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create radiobutton") );
-
-
-  SetFont(parent->GetFont());
-
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin((WXHWND)m_hWnd);
-
-//  SetValue(value);
-*/
-
-  // start GRW fix
-  if (label != wxT(""))
-  {
-    int label_width, label_height;
-    GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont());
-    if (width < 0)
-      width = (int)(label_width + RADIO_SIZE);
-    if (height<0)
+        m_windowId = vId;
+
+
+    m_windowStyle = lStyle ;
+
+    if (m_windowStyle & wxRB_GROUP)
+        lGroupStyle = WS_GROUP;
+
+    lsStyle = lGroupStyle | BS_AUTORADIOBUTTON | WS_VISIBLE ;
+
+    if (m_windowStyle & wxCLIP_SIBLINGS )
+        lsStyle |= WS_CLIPSIBLINGS;
+    //
+    // If the parent is a scrolled window the controls must
+    // have this style or they will overlap the scrollbars
+    //
+    if (pParent)
+        if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
+            pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
+            lsStyle |= WS_CLIPSIBLINGS;
+
+    m_hWnd = (WXHWND)::WinCreateWindow ( GetHwndOf(pParent)
+                                        ,WC_BUTTON
+                                        ,rsLabel.c_str()
+                                        ,lsStyle
+                                        ,0, 0, 0, 0
+                                        ,GetWinHwnd(pParent)
+                                        ,HWND_TOP
+                                        ,(HMENU)m_windowId
+                                        ,NULL
+                                        ,NULL
+                                       );
+    wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create radiobutton"));
+
+    if (rsLabel != wxT(""))
     {
     {
-      height = (int)(label_height);
-      if (height < RADIO_SIZE)
-        height = RADIO_SIZE;
+        int                         nLabelWidth;
+        int                         nLabelHeight;
+
+        GetTextExtent( rsLabel
+                      ,&nLabelWidth
+                      ,&nLabelHeight
+                      ,NULL
+                      ,NULL
+                      ,&this->GetFont()
+                     );
+        if (nWidth < 0)
+            nWidth = (int)(nLabelWidth + RADIO_SIZE);
+        if (nHeight<0)
+        {
+            nHeight = (int)(nLabelHeight);
+            if (nHeight < RADIO_SIZE)
+                nHeight = RADIO_SIZE;
+        }
+    }
+    else
+    {
+        if (nWidth < 0)
+            nWidth = RADIO_SIZE;
+        if (nHeight < 0)
+            nHeight = RADIO_SIZE;
     }
     }
-  }
-  else
-  {
-    if (width < 0)
-      width = RADIO_SIZE;
-    if (height < 0)
-      height = RADIO_SIZE;
-  }
-  // end GRW fix
-
-  SetSize(x, y, width, height);
-  return FALSE;
-}
-
-void wxRadioButton::SetLabel(const wxString& label)
-{
-    // TODO
-}
 
 
-void wxRadioButton::SetValue(bool value)
-{
-    // TODO
-}
+    //
+    // Subclass again for purposes of dialog editing mode
+    //
+    SubclassWin((WXHWND)m_hWnd);
+    SetFont(pParent->GetFont());
+    SetSize( nX
+            ,nY
+            ,nWidth
+            ,nHeight
+           );
+    return FALSE;
+} // end of wxRadioButton::Create
 
 
+//
 // Get single selection, for single choice list items
 // Get single selection, for single choice list items
+//
 bool wxRadioButton::GetValue() const
 {
 bool wxRadioButton::GetValue() const
 {
-    // TODO
-    return FALSE;
-}
-
-void wxRadioButton::Command (wxCommandEvent & event)
-{
-  SetValue ( (event.m_commandInt != 0) );
-  ProcessCommand (event);
-}
+    return((::WinSendMsg((HWND) GetHWND(), BM_QUERYCHECK, (MPARAM)0L, (MPARAM)0L) != 0));
+} // end of wxRadioButton::GetValue
 
 
-// Not implemented
-#if 0
-
-bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
-       const wxBitmap *bitmap,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator,
-#endif
-           const wxString& name)
+bool wxRadioButton::OS2Command(
+  WXUINT                            wParam
+, WXWORD                            wId
+)
 {
 {
-  SetName(name);
-#if wxUSE_VALIDATORS
-  SetValidator(validator);
-#endif
-
-  if (parent) parent->AddChild(this);
-  SetBackgroundColour(parent->GetBackgroundColour());
-  SetForegroundColour(parent->GetForegroundColour());
-
-  if ( id == -1 )
-    m_windowId = (int)NewControlId();
-  else
-  m_windowId = id;
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-  m_windowStyle = style ;
-
-  long groupStyle = 0;
-  if (m_windowStyle & wxRB_GROUP)
-    groupStyle = WS_GROUP;
-
-// TODO:
-/*
-//  long msStyle = groupStyle | RADIO_FLAGS;
-//  long msStyle = groupStyle | BS_RADIOBUTTON | WS_CHILD | WS_VISIBLE ;
-
-  m_hWnd = (WXHWND) CreateWindowEx(MakeExtendedStyle(m_windowStyle), RADIO_CLASS, "toggle",
-                          msStyle,0,0,0,0,
-                          (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
-
-  wxCHECK_MSG( m_hWnd, "Failed to create radio button", FALSE );
-
-*/
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(GetHWND());
-
-  SetSize(x, y, width, height);
-
-  return TRUE;
-}
+    if (wParam == BN_CLICKED)
+    {
+        wxCommandEvent              rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED
+                                           ,m_windowId
+                                          );
 
 
-void wxBitmapRadioButton::SetLabel(const wxBitmap *bitmap)
-{
-}
+        rEvent.SetEventObject(this);
+        ProcessCommand(rEvent);
+        return TRUE;
+    }
+    else
+        return FALSE;
+} // end of wxRadioButton::OS2Command
 
 
-void wxBitmapRadioButton::SetValue(bool value)
+void wxRadioButton::SetLabel(
+  const wxString&                   rsLabel
+)
 {
 {
-// Following necessary for Win32s, because Win32s translate BM_SETCHECK
-//  SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L);
-}
+    ::WinSetWindowText((HWND)GetHWND(), (const char *)rsLabel.c_str());
+} // end of wxRadioButton::SetLabel
 
 
-// Get single selection, for single choice list items
-bool wxBitmapRadioButton::GetValue(void) const
+void wxRadioButton::SetValue(
+  bool                              bValue
+)
 {
 {
-//  return (bool)SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L);
-    return FALSE;
-}
+    ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);
+} // end of wxRadioButton::SetValue
 
 
-#endif
\ No newline at end of file
wxWidgets (Impactor)