include X11/Xutil.h for wxMotif compilation

[wxWidgets.git] / src / mac / classic / radiobox.cpp

diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp
index 39bd6b2855fce0886b661da0ceb4e038012d9a0e..e29ce47f4c25235b35656a4f2c8b7695d1018acb 100644 (file)
--- a/src/mac/classic/radiobox.cpp
+++ b/src/mac/classic/radiobox.cpp
@@ -6,18 +6,24 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------
 //         headers
 //-------------------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------
 //         headers
 //-------------------------------------------------------------------------------------
 

-#include "wx/defs.h"
-#include "wx/arrstr.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_RADIOBOX

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

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

 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)


@@ -27,7 +33,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 //-------------------------------------------------------------------------------------
 // Default constructor
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
 //-------------------------------------------------------------------------------------
 // Default constructor
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)

-EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )
+    EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )

 END_EVENT_TABLE()
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 END_EVENT_TABLE()
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )


@@ -37,7 +43,7 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
         wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
         int i = GetSelection() ;
         event.SetInt( i );
         wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
         int i = GetSelection() ;
         event.SetInt( i );

-        event.SetString( GetString( i ) );
+        event.SetString(GetString(i));

         event.SetEventObject( this );
         ProcessCommand(event);
     }
         event.SetEventObject( this );
         ProcessCommand(event);
     }


@@ -109,7 +115,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     int i;
 
 
     int i;
 

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

     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 


@@ -153,14 +159,12 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 bool wxRadioBox::Enable(bool enable)
 {
 
 bool wxRadioBox::Enable(bool enable)
 {

-    int i;
-    wxRadioButton *current;
-

     if (!wxControl::Enable(enable))
         return false;
 
     if (!wxControl::Enable(enable))
         return false;
 

-    current = m_radioButtonCycle;
-    for (i = 0; i < m_noItems; i++) {
+    wxRadioButton *current = m_radioButtonCycle;
+    for (unsigned int i = 0; i < m_noItems; i++)
+    {

         current->Enable(enable);
         current = current->NextInCycle();
     }
         current->Enable(enable);
         current = current->NextInCycle();
     }


@@ -168,21 +172,19 @@ bool wxRadioBox::Enable(bool enable)
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//         ¥ Enable(int, bool)
+//         ¥ Enable(unsigned int, bool)

 //-------------------------------------------------------------------------------------
 // Enables or disables an given button
 
 //-------------------------------------------------------------------------------------
 // Enables or disables an given button
 

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

 {
 {

-    int i;
-    wxRadioButton *current;
-

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

-    i = 0;
-    current = m_radioButtonCycle;
-    while (i != item) {
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {

         i++;
         current = current->NextInCycle();
     }
         i++;
         current = current->NextInCycle();
     }


@@ -204,15 +206,14 @@ wxString wxRadioBox::GetLabel() const
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 

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

 {
 {

-    int i;

     wxRadioButton *current;
 
     if (!IsValid(item))
         return wxEmptyString;
 
     wxRadioButton *current;
 
     if (!IsValid(item))
         return wxEmptyString;
 

-    i = 0;
+    unsigned int i = 0;

     current = m_radioButtonCycle;
     while (i != item) {
         i++;
     current = m_radioButtonCycle;
     while (i != item) {
         i++;


@@ -264,16 +265,15 @@ void wxRadioBox::SetLabel(const wxString& label)
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 

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

 {
 {

-    int i;
-    wxRadioButton *current;
-

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

-    i=0;
-    current=m_radioButtonCycle;
-    while (i!=item) {
+
+    unsigned int i=0;
+    wxRadioButton *current=m_radioButtonCycle;
+    while (i!=item)
+    {

         i++;
         current=current->NextInCycle();
     }
         i++;
         current=current->NextInCycle();
     }


@@ -310,13 +310,12 @@ void wxRadioBox::SetSelection(int item)
 
 bool wxRadioBox::Show(bool show)
 {
 
 bool wxRadioBox::Show(bool show)
 {

-    int i;

     wxRadioButton *current;
 
     wxControl::Show(show);
 
     current=m_radioButtonCycle;
     wxRadioButton *current;
 
     wxControl::Show(show);
 
     current=m_radioButtonCycle;

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

     {
         current->Show(show);
         current=current->NextInCycle();
     {
         current->Show(show);
         current=current->NextInCycle();


@@ -325,19 +324,17 @@ bool wxRadioBox::Show(bool show)
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//         ¥ Show(int, bool)
+//         ¥ Show(unsigned int, bool)

 //-------------------------------------------------------------------------------------
 // Shows or hides the given button
 
 //-------------------------------------------------------------------------------------
 // Shows or hides the given button
 

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

 {
 {

-    int i;
-    wxRadioButton *current;
-

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

-    i=0;
-    current=m_radioButtonCycle;
+
+    unsigned int i = 0;
+    wxRadioButton *current=m_radioButtonCycle;

     while (i!=item) {
         i++;
         current=current->NextInCycle();
     while (i!=item) {
         i++;
         current=current->NextInCycle();


@@ -385,7 +382,7 @@ void wxRadioBox::SetFocus()
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    int i;
+    unsigned int i;

     wxRadioButton *current;
 
     // define the position
     wxRadioButton *current;
 
     // define the position


@@ -423,7 +420,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         eachHeight[i] = (int)((3*eachHeight[i])/2);
         if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
         eachHeight[i] = (int)((3*eachHeight[i])/2);
         if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];

-          }
+    }

 
     totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
 
     totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;


@@ -504,7 +501,7 @@ wxSize wxRadioBox::DoGetBestSize() const
     maxWidth = -1;
     maxHeight = -1;
 
     maxWidth = -1;
     maxHeight = -1;
 

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

     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight);
         eachWidth  = (int)(eachWidth + RADIO_SIZE) ;
     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight);
         eachWidth  = (int)(eachWidth + RADIO_SIZE) ;


@@ -529,3 +526,5 @@ wxSize wxRadioBox::DoGetBestSize() const
 
     return wxSize(totWidth, totHeight);
 }
 
     return wxSize(totWidth, totHeight);
 }

+
+#endif // wxUSE_RADIOBOX