declared (not implemented yet) wxMimeTypesManager::AddFallbacks()

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index c0d0f9202da7bcea63eb0f949a28407153c32bdc..5328d1565d88f02905e80f01fbec69f20faf860a 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/radiobox.h"
 #endif
 
 #include "wx/radiobox.h"

+
+#if wxUSE_RADIOBOX
+

 #include "wx/dialog.h"
 #include "wx/frame.h"
 
 #include "wx/dialog.h"
 #include "wx/frame.h"
 


@@ -19,6 +22,13 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -31,7 +41,9 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
 {
 
 static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
 {

-    if (!rb->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!rb->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
 
     if (rb->m_alreadySent)
     if (g_blockEventsOnDrag) return;
 
     if (rb->m_alreadySent)


@@ -59,7 +71,7 @@ BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
     EVT_SIZE(wxRadioBox::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxRadioBox::OnSize)
 END_EVENT_TABLE()
 

-wxRadioBox::wxRadioBox(void)
+wxRadioBox::wxRadioBox()

 {
 }
 
 {
 }
 


@@ -73,22 +85,34 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 

-    PreCreation( parent, id, pos, size, style, name );
-
-    SetValidator( validator );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( _T("wxRadioBox creation failed") );
+       return FALSE;
+    }

 
 

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

 
     m_majorDim = majorDim;
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 
 
     m_majorDim = majorDim;
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 

+    wxString label;

     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
     {
     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
     {

-        if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+        if ( i != 0 )
+            radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+
+        label.Empty();
+        for ( const wxChar *pc = choices[i]; *pc; pc++ )
+        {
+            if ( *pc != _T('&') )
+                label += *pc;
+        }

 
 

-        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
+        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );

 
         m_boxes.Append( (wxObject*) m_radio );
 
 
         m_boxes.Append( (wxObject*) m_radio );
 


@@ -99,8 +123,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

-        gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), GTK_WIDGET(m_radio), m_x+10, m_y+10+(i*24) );
-
+        gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
+                         GTK_WIDGET(m_radio),
+                         m_x+10, m_y+10+(i*24), 10, 10 );

     }
 
     wxSize ls = LayoutItems();
     }
 
     wxSize ls = LayoutItems();


@@ -110,9 +135,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     if (newSize.y == -1) newSize.y = ls.y;
     SetSize( newSize.x, newSize.y );
 
     if (newSize.y == -1) newSize.y = ls.y;
     SetSize( newSize.x, newSize.y );
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
 
     PostCreation();
 


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

-wxRadioBox::~wxRadioBox(void)
+wxRadioBox::~wxRadioBox()

 {
     wxNode *node = m_boxes.First();
     while (node)
 {
     wxNode *node = m_boxes.First();
     while (node)


@@ -140,9 +163,9 @@ wxRadioBox::~wxRadioBox(void)
 
 void wxRadioBox::OnSize( wxSizeEvent &event )
 {
 
 void wxRadioBox::OnSize( wxSizeEvent &event )
 {

-    wxControl::OnSize( event );
-

     LayoutItems();
     LayoutItems();

+
+    event.Skip();

 }
 
 wxSize wxRadioBox::LayoutItems()
 }
 
 wxSize wxRadioBox::LayoutItems()


@@ -150,20 +173,41 @@ wxSize wxRadioBox::LayoutItems()
     int x = 7;
     int y = 15;
 
     int x = 7;
     int y = 15;
 

+    if ( m_majorDim == 0 )
+    {
+        // avoid dividing by 0 below
+        wxFAIL_MSG( _T("dimension of radiobox should not be 0!") );
+
+        m_majorDim = 1;
+    }
+

     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
 
     wxSize res( 0, 0 );
 
     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
 
     wxSize res( 0, 0 );
 

-    if (m_windowStyle & wxRA_HORIZONTAL)
+    int num_of_cols = 0;
+    int num_of_rows = 0;
+    if (HasFlag(wxRA_SPECIFY_COLS))

     {
     {

-
-        for (int j = 0; j < m_majorDim; j++)
+        num_of_cols = m_majorDim;
+        num_of_rows = num_per_major;
+    }
+    else
+    {
+        num_of_cols = num_per_major;
+        num_of_rows = m_majorDim;
+    }
+       
+    if ( HasFlag(wxRA_SPECIFY_COLS) ||
+         (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
+    {
+        for (int j = 0; j < num_of_cols; j++)

         {
             y = 15;
 
             int max_len = 0;
         {
             y = 15;
 
             int max_len = 0;

-            wxNode *node = m_boxes.Nth( j*num_per_major );
-            for (int i1 = 0; i1< num_per_major; i1++)
+            wxNode *node = m_boxes.Nth( j*num_of_rows );
+            for (int i1 = 0; i1< num_of_rows; i1++)

             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
                 GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
                 GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );


@@ -172,7 +216,7 @@ wxSize wxRadioBox::LayoutItems()
                 if (len > max_len) max_len = len;
 
                 gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 if (len > max_len) max_len = len;
 
                 gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );

-                y += 20;
+                y += 22;

 
                 node = node->Next();
                 if (!node) break;
 
                 node = node->Next();
                 if (!node) break;


@@ -180,12 +224,12 @@ wxSize wxRadioBox::LayoutItems()
 
             // we don't know the max_len before
 
 
             // we don't know the max_len before
 

-            node = m_boxes.Nth( j*num_per_major );
-            for (int i2 = 0; i2< num_per_major; i2++)
+            node = m_boxes.Nth( j*num_of_rows );
+            for (int i2 = 0; i2< num_of_rows; i2++)

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

-                gtk_widget_set_usize( button, max_len, 20 );
+                gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 );

 
                 node = node->Next();
                 if (!node) break;
 
                 node = node->Next();
                 if (!node) break;


@@ -221,9 +265,8 @@ wxSize wxRadioBox::LayoutItems()
         {
             GtkWidget *button = GTK_WIDGET( node->Data() );
 
         {
             GtkWidget *button = GTK_WIDGET( node->Data() );
 

-            gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
+            gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );

             x += max;
             x += max;

-            gtk_widget_set_usize( button, max, 20 );

 
             node = node->Next();
         }
 
             node = node->Next();
         }


@@ -236,10 +279,13 @@ wxSize wxRadioBox::LayoutItems()
 
 bool wxRadioBox::Show( bool show )
 {
 
 bool wxRadioBox::Show( bool show )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") );

 
     wxWindow::Show( show );
 
 
     wxWindow::Show( show );
 

+    if ((m_windowStyle & wxNO_BORDER) != 0)
+        gtk_widget_hide( m_widget );
+

     wxNode *node = m_boxes.First();
     while (node)
     {
     wxNode *node = m_boxes.First();
     while (node)
     {


@@ -255,7 +301,7 @@ bool wxRadioBox::Show( bool show )
 
 int wxRadioBox::FindString( const wxString &s ) const
 {
 
 int wxRadioBox::FindString( const wxString &s ) const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") );

 
     int count = 0;
 
 
     int count = 0;
 


@@ -276,7 +322,7 @@ int wxRadioBox::FindString( const wxString &s ) const
 
 void wxRadioBox::SetFocus()
 {
 
 void wxRadioBox::SetFocus()
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );

 
     if (m_boxes.GetCount() == 0) return;
 
 
     if (m_boxes.GetCount() == 0) return;
 


@@ -297,20 +343,24 @@ void wxRadioBox::SetFocus()
 
 void wxRadioBox::SetSelection( int n )
 {
 
 void wxRadioBox::SetSelection( int n )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );

 
     wxNode *node = m_boxes.Nth( n );
 
 
     wxNode *node = m_boxes.Nth( n );
 

-    wxCHECK_RET( node, "radiobox wrong index" );
+    wxCHECK_RET( node, _T("radiobox wrong index") );

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

+    DisableEvents();
+    

     gtk_toggle_button_set_state( button, 1 );
     gtk_toggle_button_set_state( button, 1 );

+    
+    EnableEvents();

 }
 
 int wxRadioBox::GetSelection(void) const
 {
 }
 
 int wxRadioBox::GetSelection(void) const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") );

 
     int count = 0;
 
 
     int count = 0;
 


@@ -323,18 +373,18 @@ int wxRadioBox::GetSelection(void) const
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    wxFAIL_MSG( "wxRadioBox none selected" );
+    wxFAIL_MSG( _T("wxRadioBox none selected") );

 
     return -1;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
 
     return -1;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") );

 
     wxNode *node = m_boxes.Nth( n );
 
 
     wxNode *node = m_boxes.Nth( n );
 

-    wxCHECK_MSG( node, "", "radiobox wrong index" );
+    wxCHECK_MSG( node, _T(""), _T("radiobox wrong index") );

 
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *label = GTK_LABEL( button->child );
 
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *label = GTK_LABEL( button->child );


@@ -344,42 +394,43 @@ wxString wxRadioBox::GetString( int n ) const
 
 wxString wxRadioBox::GetLabel( int item ) const
 {
 
 wxString wxRadioBox::GetLabel( int item ) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") );

 
     return GetString( item );
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {
 
     return GetString( item );
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );

 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

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

 }
 
 void wxRadioBox::SetLabel( int item, const wxString& label )
 {
 }
 
 void wxRadioBox::SetLabel( int item, const wxString& label )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );

 
     wxNode *node = m_boxes.Nth( item );
 
 
     wxNode *node = m_boxes.Nth( item );
 

-    wxCHECK_RET( node, "radiobox wrong index" );
+    wxCHECK_RET( node, _T("radiobox wrong index") );

 
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *g_label = GTK_LABEL( button->child );
 
 
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *g_label = GTK_LABEL( button->child );
 

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

 }
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
 {
 }
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
 {

-    wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+    wxFAIL_MSG(_T("wxRadioBox::SetLabel not implemented."));

 }
 
 }
 

-void wxRadioBox::Enable( bool enable )
+bool wxRadioBox::Enable( bool enable )

 {
 {

-    wxControl::Enable( enable );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;

 
     wxNode *node = m_boxes.First();
     while (node)
 
     wxNode *node = m_boxes.First();
     while (node)


@@ -390,15 +441,17 @@ void wxRadioBox::Enable( bool enable )
         gtk_widget_set_sensitive( label, enable );
         node = node->Next();
     }
         gtk_widget_set_sensitive( label, enable );
         node = node->Next();
     }

+
+    return TRUE;

 }
 
 void wxRadioBox::Enable( int item, bool enable )
 {
 }
 
 void wxRadioBox::Enable( int item, bool enable )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );

 
     wxNode *node = m_boxes.Nth( item );
 
 
     wxNode *node = m_boxes.Nth( item );
 

-    wxCHECK_RET( node, "radiobox wrong index" );
+    wxCHECK_RET( node, _T("radiobox wrong index") );

 
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkWidget *label = button->child;
 
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkWidget *label = button->child;


@@ -408,11 +461,11 @@ void wxRadioBox::Enable( int item, bool enable )
 
 void wxRadioBox::Show( int item, bool show )
 {
 
 void wxRadioBox::Show( int item, bool show )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );

 
     wxNode *node = m_boxes.Nth( item );
 
 
     wxNode *node = m_boxes.Nth( item );
 

-    wxCHECK_RET( node, "radiobox wrong index" );
+    wxCHECK_RET( node, _T("radiobox wrong index") );

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


@@ -424,7 +477,7 @@ void wxRadioBox::Show( int item, bool show )
 
 wxString wxRadioBox::GetStringSelection(void) const
 {
 
 wxString wxRadioBox::GetStringSelection(void) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") );

 
     wxNode *node = m_boxes.First();
     while (node)
 
     wxNode *node = m_boxes.First();
     while (node)


@@ -438,13 +491,13 @@ wxString wxRadioBox::GetStringSelection(void) const
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    wxFAIL_MSG( "wxRadioBox none selected" );
-    return "";
+    wxFAIL_MSG( _T("wxRadioBox none selected") );
+    return _T("");

 }
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
 {
 }
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") );

 
     int res = FindString( s );
     if (res == -1) return FALSE;
 
     int res = FindString( s );
     if (res == -1) return FALSE;


@@ -465,7 +518,31 @@ int wxRadioBox::GetNumberOfRowsOrCols(void) const
 
 void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 {
 
 void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 {

-    wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
+    wxFAIL_MSG(_T("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
+}
+
+void wxRadioBox::DisableEvents()
+{
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+        gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
+           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+       node = node->Next();
+    }
+}
+
+void wxRadioBox::EnableEvents()
+{
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+        gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
+           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+       node = node->Next();
+    }

 }
 
 void wxRadioBox::ApplyWidgetStyle()
 }
 
 void wxRadioBox::ApplyWidgetStyle()


@@ -503,3 +580,5 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 
     return FALSE;
 }
 
     return FALSE;
 }

+
+#endif