Updates for doc/view from Morgan Hua

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 3538f3c037a96e6fbb6564bd02011d03755af2a7..1053519c931dc1f62a29dadb657f58997e8e2a02 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -123,7 +123,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
     }
     else if ( !win->m_hasFocus )
     {
-        win->m_hasFocus = TRUE;
+        win->m_hasFocus = true;
 
         wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
         event.SetEventObject( win );
@@ -147,8 +147,8 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget,
 
     // we might have lost the focus, but may be not - it may have just gone to
     // another button in the same radiobox, so we'll check for it in the next
-    // idle iteration (leave m_hasFocus == TRUE for now)
-    win->m_lostFocus = TRUE;
+    // idle iteration (leave m_hasFocus == true for now)
+    win->m_lostFocus = true;
 
     return FALSE;
 }
@@ -161,11 +161,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 void wxRadioBox::Init()
 {
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;
 
     m_hasFocus =
-    m_lostFocus = FALSE;
+    m_lostFocus = false;
 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
@@ -191,7 +191,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioBox creation failed") );
-        return FALSE;
+        return false;
     }
 
     m_widget = gtk_frame_new( wxGTK_CONV( title ) );
@@ -254,7 +254,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     if ( wasShown )
         Show();
 
-    return TRUE;
+    return true;
 }
 
 wxRadioBox::~wxRadioBox()
@@ -286,6 +286,7 @@ wxSize wxRadioBox::DoGetBestSize() const
     if (req.width > size.x)
         size.x = req.width;
 
+    CacheBestSize(size);
     return size;
 }
 
@@ -313,9 +314,9 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const
         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)) )
     {
@@ -335,7 +336,7 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const
                 req.height = 2;
                 (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
                       (button, &req );
-                      
+
                 if (req.width > max_len) max_len = req.width;
 
                 if ( !justCalc )
@@ -408,12 +409,12 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const
 
 bool wxRadioBox::Show( bool show )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     if (!wxControl::Show(show))
     {
         // nothing to do
-        return FALSE;
+        return false;
     }
 
     if ( HasFlag(wxNO_BORDER) )
@@ -429,12 +430,12 @@ bool wxRadioBox::Show( bool show )
         node = node->GetNext();
     }
 
-    return TRUE;
+    return true;
 }
 
 int wxRadioBox::FindString( const wxString &find ) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
 
     int count = 0;
 
@@ -455,7 +456,7 @@ int wxRadioBox::FindString( const wxString &find ) const
         node = node->GetNext();
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 void wxRadioBox::SetFocus()
@@ -496,7 +497,7 @@ void wxRadioBox::SetSelection( int n )
 
 int wxRadioBox::GetSelection(void) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
 
     int count = 0;
 
@@ -511,16 +512,16 @@ int wxRadioBox::GetSelection(void) const
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.Item( n );
 
-    wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 
     GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
 
@@ -558,7 +559,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
-        return FALSE;
+        return false;
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
@@ -571,31 +572,33 @@ bool wxRadioBox::Enable( bool enable )
         node = node->GetNext();
     }
 
-    return TRUE;
+    return true;
 }
 
-void wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable( int item, bool enable )
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxCHECK_RET( node, wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
     GtkButton *button = GTK_BUTTON( node->GetData() );
     GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+
+    return true;
 }
 
-void wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::Show( int item, bool show )
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxCHECK_RET( node, wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
     GtkWidget *button = GTK_WIDGET( node->GetData() );
 
@@ -603,11 +606,13 @@ void wxRadioBox::Show( int item, bool show )
         gtk_widget_show( button );
     else
         gtk_widget_hide( button );
+
+    return true;
 }
 
 wxString wxRadioBox::GetStringSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
@@ -628,18 +633,18 @@ wxString wxRadioBox::GetStringSelection() const
     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
-    return wxT("");
+    return wxEmptyString;
 }
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     int res = FindString( s );
-    if (res == -1) return FALSE;
+    if (res == wxNOT_FOUND) return false;
     SetSelection( res );
 
-    return TRUE;
+    return true;
 }
 
 int wxRadioBox::GetCount() const
@@ -647,16 +652,6 @@ int wxRadioBox::GetCount() const
     return m_boxes.GetCount();
 }
 
-int wxRadioBox::GetNumberOfRowsOrCols() const
-{
-    return 1;
-}
-
-void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
-{
-    wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
-}
-
 void wxRadioBox::GtkDisableEvents()
 {
     wxList::compatibility_iterator node = m_boxes.GetFirst();
@@ -681,19 +676,21 @@ void wxRadioBox::GtkEnableEvents()
     }
 }
 
-void wxRadioBox::ApplyWidgetStyle()
+void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
+    gtk_widget_modify_style( m_widget, style );
 
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+#ifdef __WXGTK20__
+    gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+#endif
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData() );
-        gtk_widget_set_style( widget, m_widgetStyle );
 
-        gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle );
+        gtk_widget_modify_style( widget, style );
+        gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
 
         node = node->GetNext();
     }
@@ -714,27 +711,27 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
-    if (window == m_widget->window) return TRUE;
+    if (window == m_widget->window) return true;
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-        if (window == button->window) return TRUE;
+        if (window == button->window) return true;
 
         node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
 void wxRadioBox::OnInternalIdle()
 {
     if ( m_lostFocus )
     {
-        m_hasFocus = FALSE;
-        m_lostFocus = FALSE;
+        m_hasFocus = false;
+        m_lostFocus = false;
 
         wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
         event.SetEventObject( this );
@@ -757,11 +754,33 @@ wxVisualAttributes
 wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
     attr = GetDefaultAttributesFromGTKWidget(widget);
-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);
     return attr;
 }
 
+#if WXWIN_COMPATIBILITY_2_2
+
+int wxRadioBox::Number() const
+{
+    return GetCount();
+}
+
+wxString wxRadioBox::GetLabel(int n) const
+{
+    return GetString(n);
+}
+
+void wxRadioBox::SetLabel( int item, const wxString& label )
+{
+    SetString(item, label);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
 #endif // wxUSE_RADIOBOX