marked dbkeyg.h as a wxBase file (fixes 685857)

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 98e57717ad7fbfb1a2f3e63f2576e5b772995f60..3d70c8d4e10a25b6057e8ad01fd2c8b55f50e52e 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -91,20 +91,20 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
     {
     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
     {

-        if (node == rb->m_boxes.First())
-            node = rb->m_boxes.Last();
+        if (node == rb->m_boxes.GetFirst())
+            node = rb->m_boxes.GetLast();

         else
         else

-            node = node->Previous();
+            node = node->GetPrevious();

     }
     else
     {
     }
     else
     {

-        if (node == rb->m_boxes.Last())
-            node = rb->m_boxes.First();
+        if (node == rb->m_boxes.GetLast())
+            node = rb->m_boxes.GetFirst();

         else
         else

-            node = node->Next();
+            node = node->GetNext();

     }
 
     }
 

-    GtkWidget *button = (GtkWidget*) node->Data();
+    GtkWidget *button = (GtkWidget*) node->GetData();

 
     gtk_widget_grab_focus( button );
 
 
     gtk_widget_grab_focus( button );
 


@@ -180,7 +180,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_widget = gtk_frame_new( title.mbc_str() );
+    m_widget = gtk_frame_new( wxGTK_CONV( title ) );

 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it


@@ -202,7 +202,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                 label += *pc;
         }
 
                 label += *pc;
         }
 

-        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
+        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );

 
         gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
            GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
            GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );


@@ -260,12 +260,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->Data() );
+        GtkWidget *button = GTK_WIDGET( node->GetData() );

         gtk_widget_destroy( button );
         gtk_widget_destroy( button );

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -314,10 +314,10 @@ wxSize wxRadioBox::LayoutItems()
             y = 15;
 
             int max_len = 0;
             y = 15;
 
             int max_len = 0;

-            wxNode *node = m_boxes.Nth( j*num_of_rows );
+            wxNode *node = m_boxes.Item( j*num_of_rows );

             for (int i1 = 0; i1< num_of_rows; i1++)
             {
             for (int i1 = 0; i1< num_of_rows; i1++)
             {

-                GtkWidget *button = GTK_WIDGET( node->Data() );
+                GtkWidget *button = GTK_WIDGET( node->GetData() );

 
                 GtkRequisition req;
                 req.width = 2;
 
                 GtkRequisition req;
                 req.width = 2;


@@ -330,20 +330,20 @@ wxSize wxRadioBox::LayoutItems()
                 gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 y += req.height;
 
                 gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 y += req.height;
 

-                node = node->Next();
+                node = node->GetNext();

                 if (!node) break;
             }
 
             // we don't know the max_len before
 
                 if (!node) break;
             }
 
             // we don't know the max_len before
 

-            node = m_boxes.Nth( j*num_of_rows );
+            node = m_boxes.Item( j*num_of_rows );

             for (int i2 = 0; i2< num_of_rows; i2++)
             {
             for (int i2 = 0; i2< num_of_rows; i2++)
             {

-                GtkWidget *button = GTK_WIDGET( node->Data() );
+                GtkWidget *button = GTK_WIDGET( node->GetData() );

 
                 gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
 
 
                 gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
 

-                node = node->Next();
+                node = node->GetNext();

                 if (!node) break;
             }
 
                 if (!node) break;
             }
 


@@ -359,10 +359,10 @@ wxSize wxRadioBox::LayoutItems()
     {
         int max = 0;
 
     {
         int max = 0;
 

-        wxNode *node = m_boxes.First();
+        wxNode *node = m_boxes.GetFirst();

         while (node)
         {
         while (node)
         {

-            GtkWidget *button = GTK_WIDGET( node->Data() );
+            GtkWidget *button = GTK_WIDGET( node->GetData() );

 
             GtkRequisition req;
             req.width = 2;
 
             GtkRequisition req;
             req.width = 2;


@@ -372,18 +372,18 @@ wxSize wxRadioBox::LayoutItems()
 
             if (req.width > max) max = req.width;
 
 
             if (req.width > max) max = req.width;
 

-            node = node->Next();
+            node = node->GetNext();

         }
 
         }
 

-        node = m_boxes.First();
+        node = m_boxes.GetFirst();

         while (node)
         {
         while (node)
         {

-            GtkWidget *button = GTK_WIDGET( node->Data() );
+            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 );
             x += max;
 
 
             gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
             x += max;
 

-            node = node->Next();
+            node = node->GetNext();

         }
         res.x = x+4;
         res.y = 40;
         }
         res.x = x+4;
         res.y = 40;


@@ -405,35 +405,40 @@ bool wxRadioBox::Show( bool show )
     if ((m_windowStyle & wxNO_BORDER) != 0)
         gtk_widget_hide( m_widget );
 
     if ((m_windowStyle & wxNO_BORDER) != 0)
         gtk_widget_hide( m_widget );
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->Data() );
+        GtkWidget *button = GTK_WIDGET( node->GetData() );

 
         if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
 
 
         if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return TRUE;
 }
 
     }
 
     return TRUE;
 }
 

-int wxRadioBox::FindString( const wxString &s ) const
+int wxRadioBox::FindString( const wxString &find ) const

 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
 
     int count = 0;
 
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
 
     int count = 0;
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
-        if (s == label->label)
+        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+#ifdef __WXGTK20__
+        wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+        wxString str( label->label );
+#endif
+        if (find == str)

             return count;
 
         count++;
 
             return count;
 
         count++;
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return -1;
     }
 
     return -1;


@@ -445,16 +450,16 @@ void wxRadioBox::SetFocus()
 
     if (m_boxes.GetCount() == 0) return;
 
 
     if (m_boxes.GetCount() == 0) return;
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );

         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );
             return;
         }
         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );
             return;
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -462,11 +467,11 @@ void wxRadioBox::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxNode *node = m_boxes.Nth( n );
+    wxNode *node = m_boxes.Item( n );

 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );

 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 


@@ -481,13 +486,13 @@ int wxRadioBox::GetSelection(void) const
 
     int count = 0;
 
 
     int count = 0;
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );

         if (button->active) return count;
         count++;
         if (button->active) return count;
         count++;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );


@@ -499,13 +504,19 @@ wxString wxRadioBox::GetString( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 

-    wxNode *node = m_boxes.Nth( n );
+    wxNode *node = m_boxes.Item( n );

 
     wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
 

-    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+
+#ifdef __WXGTK20__
+    wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+    wxString str( label->label );
+#endif

 
 

-    return wxString( label->label );
+    return str;

 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 }
 
 void wxRadioBox::SetLabel( const wxString& label )


@@ -514,20 +525,20 @@ void wxRadioBox::SetLabel( const wxString& label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

-    gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
+    gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) );

 }
 
 void wxRadioBox::SetString( int item, const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 }
 
 void wxRadioBox::SetString( int item, const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxNode *node = m_boxes.Nth( item );
+    wxNode *node = m_boxes.Item( item );

 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );

 
 

-    gtk_label_set( g_label, label.mbc_str() );
+    gtk_label_set( g_label, wxGTK_CONV( label ) );

 }
 
 bool wxRadioBox::Enable( bool enable )
 }
 
 bool wxRadioBox::Enable( bool enable )


@@ -535,15 +546,15 @@ bool wxRadioBox::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         return FALSE;
 
     if ( !wxControl::Enable( enable ) )
         return FALSE;
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkButton *button = GTK_BUTTON( node->Data() );
+        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 );
         GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
 
         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
         gtk_widget_set_sensitive( GTK_WIDGET(label), enable );

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -553,11 +564,11 @@ void wxRadioBox::Enable( int item, bool enable )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxNode *node = m_boxes.Nth( item );
+    wxNode *node = m_boxes.Item( item );

 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkButton *button = GTK_BUTTON( node->Data() );
+    GtkButton *button = GTK_BUTTON( node->GetData() );

     GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );


@@ -568,11 +579,11 @@ void wxRadioBox::Show( int item, bool show )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxNode *node = m_boxes.Nth( item );
+    wxNode *node = m_boxes.Item( item );

 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkWidget *button = GTK_WIDGET( node->Data() );
+    GtkWidget *button = GTK_WIDGET( node->GetData() );

 
     if (show)
         gtk_widget_show( button );
 
     if (show)
         gtk_widget_show( button );


@@ -584,17 +595,22 @@ wxString wxRadioBox::GetStringSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );

         if (button->active)
         {
         if (button->active)
         {

-            GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+            GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );

 
 

-            return label->label;
+#ifdef __WXGTK20__
+            wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+            wxString str( label->label );
+#endif
+            return str;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );


@@ -614,7 +630,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
 
 int wxRadioBox::GetCount() const
 {
 
 int wxRadioBox::GetCount() const
 {

-    return m_boxes.Number();
+    return m_boxes.GetCount();

 }
 
 int wxRadioBox::GetNumberOfRowsOrCols() const
 }
 
 int wxRadioBox::GetNumberOfRowsOrCols() const


@@ -629,25 +645,25 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 
 void wxRadioBox::GtkDisableEvents()
 {
 
 void wxRadioBox::GtkDisableEvents()
 {

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
+        gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()),

            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
 void wxRadioBox::GtkEnableEvents()
 {
     }
 }
 
 void wxRadioBox::GtkEnableEvents()
 {

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
+        gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked",

            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -657,27 +673,27 @@ void wxRadioBox::ApplyWidgetStyle()
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *widget = GTK_WIDGET( node->Data() );
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );

         gtk_widget_set_style( widget, m_widgetStyle );
 
         gtk_widget_set_style( widget, m_widgetStyle );
 

-        gtk_widget_set_style( BUTTON_CHILD(node->Data()), m_widgetStyle );
+        gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle );

 
 

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
 #if wxUSE_TOOLTIPS
 void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 {
     }
 }
 
 #if wxUSE_TOOLTIPS
 void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 {

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *widget = GTK_WIDGET( node->Data() );
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );

         gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
         gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 #endif // wxUSE_TOOLTIPS
     }
 }
 #endif // wxUSE_TOOLTIPS


@@ -686,14 +702,14 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
     if (window == m_widget->window) return TRUE;
 
 {
     if (window == m_widget->window) return TRUE;
 

-    wxNode *node = m_boxes.First();
+    wxNode *node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->Data() );
+        GtkWidget *button = GTK_WIDGET( node->GetData() );

 
         if (window == button->window) return TRUE;
 
 
         if (window == button->window) return TRUE;
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return FALSE;
     }
 
     return FALSE;