make --static flag act on --cppflags too.

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

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index 3c4c07e73e7a3a1ce8a6077f9f6d939bee8f1e29..f4c7ca150934c413e07b8242d1c8a647548dfdf9 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -14,9 +14,12 @@
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__

-#pragma implementation "radiobox.h"
+  #pragma implementation "radioboxbase.h"
+  #pragma implementation "radiobox.h"

 #endif
 
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/radiobox.h"
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"
 #include "wx/radiobox.h"
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"


@@ -38,12 +41,15 @@ END_EVENT_TABLE()
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {

+  if ( outer.IsChecked() )
+  {

     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
     int i = GetSelection() ;
     event.SetInt( i );
     event.SetString( GetString( i ) );
     event.SetEventObject( this );
     ProcessCommand(event);
     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
     int i = GetSelection() ;
     event.SetInt( i );
     event.SetString( GetString( i ) );
     event.SetEventObject( this );
     ProcessCommand(event);

+  }

 }
 
 wxRadioBox::wxRadioBox()
 }
 
 wxRadioBox::wxRadioBox()


@@ -111,11 +117,9 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 

                kControlGroupBoxTextTitleProc , (long) this ) ;
        
                kControlGroupBoxTextTitleProc , (long) this ) ;
        

-       MacPostControlCreate() ;
-

     for (i = 0; i < n; i++)
     {
         wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10),
     for (i = 0; i < n; i++)
     {
         wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10),


@@ -126,7 +130,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     }
 
        SetSelection(0);
     }
 
        SetSelection(0);

-       SetSize(pos.x,pos.y,size.x,size.y);
+       MacPostControlCreate() ;

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -176,28 +180,6 @@ void wxRadioBox::Enable(int item, bool enable)
        }
 }
 
        }
 }
 

-
-//-------------------------------------------------------------------------------------
-//             ¥ FindString
-//-------------------------------------------------------------------------------------
-// Finds a button matching the given string, returning the position if found 
-// or -1 if not found
-
-int wxRadioBox::FindString(const wxString& s) const
-{
-    int i;
-    wxRadioButton *current;
-    
-    current=m_radioButtonCycle;
-    for (i = 0; i < m_noItems; i++)
-    {
-        if (s == current->GetLabel())
-            return i;
-       current=current->NextInCycle();
-    }
-    return -1;
-}
-

 //-------------------------------------------------------------------------------------
 //             ¥ GetLabel()
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //             ¥ GetLabel()
 //-------------------------------------------------------------------------------------


@@ -213,7 +195,7 @@ wxString wxRadioBox::GetLabel() const
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 

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

 {
        int i;
     wxRadioButton *current;
 {
        int i;
     wxRadioButton *current;


@@ -249,31 +231,6 @@ int wxRadioBox::GetSelection() const
     return i;
 }
 
     return i;
 }
 

-//-------------------------------------------------------------------------------------
-//             ¥ GetString
-//-------------------------------------------------------------------------------------
-// Find string for position
-
-wxString wxRadioBox::GetString(int item) const
-{
-
-    return GetLabel(item);
-}
-
-//-------------------------------------------------------------------------------------
-//             ¥ GetStringSelection
-//-------------------------------------------------------------------------------------
-// Returns the selected string
-
-wxString wxRadioBox::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return this->GetString (sel);
-    else
-        return wxString("");
-}
-

 //-------------------------------------------------------------------------------------
 //             ¥ Number
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //             ¥ Number
 //-------------------------------------------------------------------------------------


@@ -297,7 +254,7 @@ void wxRadioBox::SetLabel(const wxString& label)
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 

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

 {
        int i;
     wxRadioButton *current;
 {
        int i;
     wxRadioButton *current;


@@ -336,24 +293,6 @@ void wxRadioBox::SetSelection(int item)
     
 }
 
     
 }
 

-//-------------------------------------------------------------------------------------
-//             ¥ SetStringSelection
-//-------------------------------------------------------------------------------------
-// Sets a button by passing the desired string. This does not cause 
-// wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
-
-bool wxRadioBox::SetStringSelection (const wxString& s)
-{
-    int sel = FindString (s);
-    if (sel > -1)
-    {
-        SetSelection (sel);
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-

 //-------------------------------------------------------------------------------------
 //             ¥ Show(bool)
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //             ¥ Show(bool)
 //-------------------------------------------------------------------------------------


@@ -474,15 +413,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
        maxHeight=-1;
        for (i = 0 ; i < m_noItems; i++)
                {
        maxHeight=-1;
        for (i = 0 ; i < m_noItems; i++)
                {

-               GetTextExtent(GetLabel(i), &eachWidth[i], &eachHeight[i]);
+               GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i]);

                eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
                eachHeight[i] = (int)((3*eachHeight[i])/2);
                if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
                if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
                }
 
                eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
                eachHeight[i] = (int)((3*eachHeight[i])/2);
                if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
                if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
                }
 

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

 
     // only change our width/height if asked for
     if ( width == -1 )
 
     // only change our width/height if asked for
     if ( width == -1 )


@@ -540,12 +479,39 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                }
 }
 
                }
 }
 

+wxSize wxRadioBox::DoGetBestSize() const
+{
+    int charWidth, charHeight;
+    int maxWidth, maxHeight;
+    int eachWidth, eachHeight;
+    int totWidth, totHeight;
+
+    wxFont font = GetParent()->GetFont();
+    GetTextExtent(wxString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+                  &charWidth, &charHeight, NULL, NULL, &font);
+    charWidth /= 52;
+
+   maxWidth = -1;
+   maxHeight = -1;
+   for (int i = 0 ; i < m_noItems; i++)
+   {
+        GetTextExtent(GetString(i), &eachWidth, &eachHeight);
+        eachWidth  = (int)(eachWidth + RADIO_SIZE) ;
+        eachHeight = (int)((3 * eachHeight) / 2);
+        if (maxWidth < eachWidth)     maxWidth = eachWidth;
+        if (maxHeight < eachHeight)   maxHeight = eachHeight;
+    }
+
+    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight * 3/2;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
+   return wxSize(totWidth, totHeight);
+}

 //-------------------------------------------------------------------------------------
 //             ¥ GetNumVer
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 
 //-------------------------------------------------------------------------------------
 //             ¥ GetNumVer
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 

-int wxRadioBox::GetNumVer() const
+int wxRadioBox::GetRowCount() const

 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {


@@ -562,7 +528,7 @@ int wxRadioBox::GetNumVer() const
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 

-int wxRadioBox::GetNumHor() const
+int wxRadioBox::GetColumnCount() const

 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {