Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 6f30a74f036008f8faff7f5f9a40760e20e3a824..aecbbea5f35b4089185462676d178dea2126bdfb 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.cpp
+// Name:        src/motif/radiobox.cpp

 // Purpose:     wxRadioBox
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxRadioBox
 // Author:      Julian Smart
 // Modified by:


@@ -12,15 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_RADIOBOX
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/defs.h"
-

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

-#include "wx/utils.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -48,7 +51,6 @@ void wxRadioBox::Init()
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;

-    m_majorDim = 0 ;

 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,


@@ -60,13 +62,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     if( !CreateControl( parent, id, pos, size, style, val, name ) )
         return false;
 
     if( !CreateControl( parent, id, pos, size, style, val, name ) )
         return false;
 

-    m_noItems = n;
+    m_noItems = (unsigned int)n;

     m_noRowsOrCols = majorDim;
 
     m_noRowsOrCols = majorDim;
 

-    if (majorDim==0)
-        m_majorDim = n ;
-    else
-        m_majorDim = majorDim ;
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     Display* dpy = XtDisplay(parentWidget);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     Display* dpy = XtDisplay(parentWidget);


@@ -77,7 +76,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
                                      XmNresizeWidth, True,
                                      NULL);
 
                                      XmNresizeWidth, True,
                                      NULL);
 

-    wxString label1(wxStripMenuCodes(title));
+    wxString label1(GetLabelText(title));

 
     if (!label1.empty())
     {
 
     if (!label1.empty())
     {


@@ -107,11 +106,9 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 
     Arg args[3];
 
 
     Arg args[3];
 

-    m_majorDim = (n + m_majorDim - 1) / m_majorDim;
-

     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));

-    XtSetArg (args[1], XmNnumColumns, m_majorDim);
+    XtSetArg (args[1], XmNnumColumns, GetMajorDim());

     XtSetArg (args[2], XmNadjustLast, False);
 
     Widget radioBoxWidget =
     XtSetArg (args[2], XmNadjustLast, False);
 
     Widget radioBoxWidget =


@@ -123,7 +120,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     int i;
     for (i = 0; i < n; i++)
     {
     int i;
     for (i = 0; i < n; i++)
     {

-        wxString str(wxStripMenuCodes(choices[i]));
+        wxString str(GetLabelText(choices[i]));

         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (
                                 wxConstCast(str.c_str(), char),
         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (
                                 wxConstCast(str.c_str(), char),


@@ -174,15 +171,15 @@ wxRadioBox::~wxRadioBox()
     m_mainWidget = (WXWidget) 0;
 }
 
     m_mainWidget = (WXWidget) 0;
 }
 

-void wxRadioBox::SetString(int item, const wxString& label)
+void wxRadioBox::SetString(unsigned int item, const wxString& label)

 {
     if (!IsValid(item))
         return;
 
 {
     if (!IsValid(item))
         return;
 

-    Widget widget = (Widget) m_radioButtons[item];
+    Widget widget = (Widget)m_radioButtons[item];

     if (!label.empty())
     {
     if (!label.empty())
     {

-        wxString label1(wxStripMenuCodes(label));
+        wxString label1(GetLabelText(label));

         wxXmString text( label1 );
         m_radioButtonLabels[item] = label1;
         XtVaSetValues (widget,
         wxXmString text( label1 );
         m_radioButtonLabels[item] = label1;
         XtVaSetValues (widget,


@@ -192,15 +189,6 @@ void wxRadioBox::SetString(int item, const wxString& label)
     }
 }
 
     }
 }
 

-int wxRadioBox::FindString(const wxString& s) const
-{
-    int i;
-    for (i = 0; i < m_noItems; i++)
-        if (s == m_radioButtonLabels[i])
-            return i;
-    return wxNOT_FOUND;
-}
-

 void wxRadioBox::SetSelection(int n)
 {
     if (!IsValid(n))
 void wxRadioBox::SetSelection(int n)
 {
     if (!IsValid(n))


@@ -212,9 +200,8 @@ void wxRadioBox::SetSelection(int n)
 
     XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);
 
 
     XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
-        if (i != n)
+    for (unsigned int i = 0; i < m_noItems; i++)
+        if (i != (unsigned int)n)

             XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);
 
     m_inSetValue = false;
             XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);
 
     m_inSetValue = false;


@@ -227,7 +214,7 @@ int wxRadioBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const

 {
     if (!IsValid(n))
         return wxEmptyString;
 {
     if (!IsValid(n))
         return wxEmptyString;


@@ -259,7 +246,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 // Enable a specific button
 }
 
 // Enable a specific button

-bool wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)

 {
     if (!IsValid(n))
         return false;
 {
     if (!IsValid(n))
         return false;


@@ -274,8 +261,7 @@ bool wxRadioBox::Enable(bool enable)
     if ( !wxControl::Enable(enable) )
         return false;
 
     if ( !wxControl::Enable(enable) )
         return false;
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

         XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
 
     return true;
         XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
 
     return true;


@@ -288,7 +274,7 @@ bool wxRadioBox::Show(bool show)
 }
 
 // Show a specific button
 }
 
 // Show a specific button

-bool wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(unsigned int n, bool show)

 {
   // This method isn't complete, and we try do do our best...
   // It's main purpose isn't for allowing Show/Unshow dynamically,
 {
   // This method isn't complete, and we try do do our best...
   // It's main purpose isn't for allowing Show/Unshow dynamically,


@@ -322,8 +308,8 @@ bool wxRadioBox::Show(int n, bool show)
 wxString wxRadioBox::GetStringSelection () const
 {
     int sel = GetSelection ();
 wxString wxRadioBox::GetStringSelection () const
 {
     int sel = GetSelection ();

-    if (sel > -1)
-        return this->GetString (sel);
+    if (sel != wxNOT_FOUND)
+        return this->GetString((unsigned int)sel);

     else
         return wxEmptyString;
 }
     else
         return wxEmptyString;
 }


@@ -350,8 +336,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);
 
 {
     wxWindow::ChangeFont(keepOriginalSize);
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         WXWidget radioButton = m_radioButtons[i];
 
     {
         WXWidget radioButton = m_radioButtons[i];
 


@@ -365,10 +350,10 @@ void wxRadioBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
 {
     wxWindow::ChangeBackgroundColour();
 

-    int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));
+    wxColour colour = *wxBLACK;
+    int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));

 
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         WXWidget radioButton = m_radioButtons[i];
 
     {
         WXWidget radioButton = m_radioButtons[i];
 


@@ -384,8 +369,7 @@ void wxRadioBox::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();
 
 {
     wxWindow::ChangeForegroundColour();
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         WXWidget radioButton = m_radioButtons[i];
 
     {
         WXWidget radioButton = m_radioButtons[i];
 


@@ -393,23 +377,6 @@ 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)
 {


@@ -418,11 +385,11 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
 
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
 
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;

-  int i;
+  unsigned int i;

   const wxWidgetArray& buttons = item->GetRadioButtons();
   for (i = 0; i < item->GetCount(); i++)
     if (((Widget)buttons[i]) == w)
   const wxWidgetArray& buttons = item->GetRadioButtons();
   for (i = 0; i < item->GetCount(); i++)
     if (((Widget)buttons[i]) == w)

-      sel = i;
+      sel = (int)i;

   item->SetSel(sel);
 
   if (item->InSetValue())
   item->SetSel(sel);
 
   if (item->InSetValue())


@@ -435,3 +402,4 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
   item->ProcessCommand (event);
 }
 
   item->ProcessCommand (event);
 }
 

+#endif // wxUSE_RADIOBOX