libpng vulnerability CAN-2004-0421

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 3d70c8d4e10a25b6057e8ad01fd2c8b55f50e52e..551fc826aacd34577d8d5f3820cfd920d6dbd00a 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -7,11 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "radiobox.h"
 #endif
 
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_RADIOBOX
 
@@ -80,7 +81,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
         return FALSE;
     }
 
-    wxNode *node = rb->m_boxes.Find( (wxObject*) widget );
+    wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget );
     if (!node)
     {
         return FALSE;
@@ -167,6 +168,19 @@ void wxRadioBox::Init()
     m_lostFocus = FALSE;
 }
 
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& title,
+                         const wxPoint &pos, const wxSize &size,
+                         const wxArrayString& choices, int majorDim,
+                         long style, const wxValidator& validator,
+                         const wxString &name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, title, pos, size, chs.GetCount(),
+                   chs.GetStrings(), majorDim, style, validator, name );
+}
+
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                          const wxPoint &pos, const wxSize &size,
                          int n, const wxString choices[], int majorDim,
@@ -229,7 +243,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_parent->DoAddChild( this );
 
+    bool wasShown = IsShown();
+    if ( wasShown )
+        Hide(); // prevent PostCreation() from showing us
     PostCreation();
+    InheritAttributes();
 
     ApplyWidgetStyle();
 
@@ -237,30 +255,17 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     SetFont( parent->GetFont() );
 
-    wxSize ls = LayoutItems();
-
-    GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
-    if (req.width > ls.x) ls.x = req.width;
+    SetBestSize( size );
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = ls.x;
-    if (newSize.y == -1) newSize.y = ls.y;
-    SetSize( newSize.x, newSize.y );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-
-    Show( TRUE );
+    if ( wasShown )
+        Show();
 
     return TRUE;
 }
 
 wxRadioBox::~wxRadioBox()
 {
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->GetData() );
@@ -273,25 +278,34 @@ void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 
-    LayoutItems();
+    LayoutItems(false);
 }
 
-wxSize wxRadioBox::LayoutItems()
+wxSize wxRadioBox::DoGetBestSize() const
 {
-    int x = 7;
-    int y = 15;
+    wxSize size = LayoutItems(true);
 
-    if ( m_majorDim == 0 )
-    {
-        // avoid dividing by 0 below
-        wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
+    if (req.width > size.x)
+        size.x = req.width;
 
-        m_majorDim = 1;
-    }
+    return size;
+}
+
+wxSize wxRadioBox::LayoutItems(bool justCalc) const
+{
+    wxSize res( 0, 0 );
+
+    // avoid dividing by 0 below
+    wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
 
     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
 
-    wxSize res( 0, 0 );
+    int x = 7;
+    int y = 15;
 
     int num_of_cols = 0;
     int num_of_rows = 0;
@@ -305,16 +319,19 @@ wxSize wxRadioBox::LayoutItems()
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }
-
+    
+    int lineheight = GetCharHeight()+2;
+    
     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
         for (int j = 0; j < num_of_cols; j++)
         {
-            y = 15;
+            y = 3;
+            y += lineheight;
 
             int max_len = 0;
-            wxNode *node = m_boxes.Item( j*num_of_rows );
+            wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows );
             for (int i1 = 0; i1< num_of_rows; i1++)
             {
                 GtkWidget *button = GTK_WIDGET( node->GetData() );
@@ -324,10 +341,11 @@ wxSize wxRadioBox::LayoutItems()
                 req.height = 2;
                 (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
                       (button, &req );
-
+                      
                 if (req.width > max_len) max_len = req.width;
 
-                gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
+                if ( !justCalc )
+                    gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 y += req.height;
 
                 node = node->GetNext();
@@ -341,7 +359,8 @@ wxSize wxRadioBox::LayoutItems()
             {
                 GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-                gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
+                if ( !justCalc )
+                    gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
 
                 node = node->GetNext();
                 if (!node) break;
@@ -359,7 +378,7 @@ wxSize wxRadioBox::LayoutItems()
     {
         int max = 0;
 
-        wxNode *node = m_boxes.GetFirst();
+        wxList::compatibility_iterator node = m_boxes.GetFirst();
         while (node)
         {
             GtkWidget *button = GTK_WIDGET( node->GetData() );
@@ -380,7 +399,8 @@ wxSize wxRadioBox::LayoutItems()
         {
             GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-            gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
+            if ( !justCalc )
+                gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
             x += max;
 
             node = node->GetNext();
@@ -402,10 +422,10 @@ bool wxRadioBox::Show( bool show )
         return FALSE;
     }
 
-    if ((m_windowStyle & wxNO_BORDER) != 0)
+    if ( HasFlag(wxNO_BORDER) )
         gtk_widget_hide( m_widget );
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->GetData() );
@@ -424,7 +444,7 @@ int wxRadioBox::FindString( const wxString &find ) const
 
     int count = 0;
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
@@ -450,7 +470,7 @@ void wxRadioBox::SetFocus()
 
     if (m_boxes.GetCount() == 0) return;
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
@@ -467,7 +487,7 @@ void wxRadioBox::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Item( n );
+    wxList::compatibility_iterator node = m_boxes.Item( n );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
@@ -486,7 +506,7 @@ int wxRadioBox::GetSelection(void) const
 
     int count = 0;
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
@@ -504,7 +524,7 @@ wxString wxRadioBox::GetString( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Item( n );
+    wxList::compatibility_iterator node = m_boxes.Item( n );
 
     wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
 
@@ -532,7 +552,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Item( item );
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
@@ -546,7 +566,7 @@ bool wxRadioBox::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         return FALSE;
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkButton *button = GTK_BUTTON( node->GetData() );
@@ -564,7 +584,7 @@ void wxRadioBox::Enable( int item, bool enable )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Item( item );
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
@@ -579,7 +599,7 @@ void wxRadioBox::Show( int item, bool show )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Item( item );
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
@@ -595,7 +615,7 @@ wxString wxRadioBox::GetStringSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
@@ -645,7 +665,7 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 
 void wxRadioBox::GtkDisableEvents()
 {
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()),
@@ -657,7 +677,7 @@ void wxRadioBox::GtkDisableEvents()
 
 void wxRadioBox::GtkEnableEvents()
 {
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked",
@@ -673,7 +693,7 @@ void wxRadioBox::ApplyWidgetStyle()
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData() );
@@ -688,7 +708,7 @@ void wxRadioBox::ApplyWidgetStyle()
 #if wxUSE_TOOLTIPS
 void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 {
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData() );
@@ -702,7 +722,7 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
     if (window == m_widget->window) return TRUE;
 
-    wxNode *node = m_boxes.GetFirst();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->GetData() );