Patch [ 588837 ] Fixes comment style in gsocket.*

[wxWidgets.git] / src / motif / radiobox.cpp

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 3f2f7b5fd6915e0950fbe2fa118243517d456d96..1bc217acea9ba38cdc7302460131541aacb8634d 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -17,6 +17,8 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/radiobox.h"
 #include "wx/utils.h"
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 


@@ -175,18 +177,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 #endif
                                     XmNfontList, fontList,
                                                  NULL);
 #endif
                                     XmNfontList, fontList,
                                                  NULL);

-#ifdef __VMS__
-#pragma message disable voiincconext
-       // VMS gives here the compiler warning:
-       // conversion from pointer to function to void* permitted
-       // as an extension
-#endif

         XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
         XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,

-                     (XtCallbackProc) this);
-#ifdef __VMS__
-#pragma message enable voiincconext
-#endif
-
+                     (XtPointer) this);

     }
     SetSelection (0);
 
     }
     SetSelection (0);
 


@@ -223,34 +215,7 @@ wxRadioBox::~wxRadioBox()
     m_labelWidget = (WXWidget) 0;
 }
 
     m_labelWidget = (WXWidget) 0;
 }
 

-wxString wxRadioBox::GetLabel(int item) const
-{
-    if (item < 0 || item >= m_noItems)
-        return wxEmptyString;
-
-    Widget widget = (Widget) m_radioButtons[item];
-    XmString text;
-    char *s;
-    XtVaGetValues (widget,
-                    XmNlabelString, &text,
-                    NULL);
-
-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-    {
-        // Should we free 'text'???
-        XmStringFree(text);
-        wxString str(s);
-        XtFree (s);
-        return str;
-    }
-    else
-    {
-        XmStringFree(text);
-        return wxEmptyString;
-    }
-}
-
-void wxRadioBox::SetLabel(int item, const wxString& label)
+void wxRadioBox::SetString(int item, const wxString& label)

 {
     if (item < 0 || item >= m_noItems)
         return;
 {
     if (item < 0 || item >= m_noItems)
         return;


@@ -399,10 +364,10 @@ void wxRadioBox::Show(int n, bool show)
 
     // Please note that this is all we can do: removing the label
     // if switching to unshow state. However, when switching
 
     // Please note that this is all we can do: removing the label
     // if switching to unshow state. However, when switching

-    // to the on state, it's the prog. resp. to call SetLabel(item,...)
+    // to the on state, it's the prog. resp. to call SetString(item,...)

     // after this call!!
     if (!show)
     // after this call!!
     if (!show)

-        wxRadioBox::SetLabel (n, " ");
+        wxRadioBox::SetString (n, " ");

 }
 
 // For single selection items only
 }
 
 // For single selection items only


@@ -485,6 +450,23 @@ void wxRadioBox::ChangeForegroundColour()
     }
 }
 
     }
 }
 

+static int CalcOtherDim( int items, int dim )
+{
+    return items / dim + ( items % dim ? 1 : 0 );
+}
+
+int wxRadioBox::GetRowCount() const
+{
+    return m_windowStyle & wxRA_SPECIFY_ROWS ? m_noRowsOrCols
+        : CalcOtherDim( GetCount(), m_noRowsOrCols );
+}
+
+int wxRadioBox::GetColumnCount() const
+{
+    return m_windowStyle & wxRA_SPECIFY_COLS ? m_noRowsOrCols
+        : CalcOtherDim( GetCount(), m_noRowsOrCols );
+}
+

 void wxRadioBoxCallback (Widget w, XtPointer clientData,
                     XmToggleButtonCallbackStruct * cbs)
 {
 void wxRadioBoxCallback (Widget w, XtPointer clientData,
                     XmToggleButtonCallbackStruct * cbs)
 {


@@ -494,7 +476,7 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
   int i;
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
   int i;

-  for (i = 0; i < item->Number(); i++)
+  for (i = 0; i < item->GetCount(); i++)

     if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
       sel = i;
   item->SetSel(sel);
     if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
       sel = i;
   item->SetSel(sel);