Played a little with sockets.

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index d972100b2610a55a4907265ae5e94661bf4d7609..432496cd91172f4b14dc9a481cf0a6e77f923f71 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -40,7 +40,7 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

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

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


@@ -68,7 +68,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()

 {
 }
 
 {
 }
 


@@ -109,8 +109,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
         gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), 
            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), 10, 10 );
+                         GTK_WIDGET(m_radio), 
+                         m_x+10, m_y+10+(i*24), 10, 10 );

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


@@ -120,9 +120,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();
 


@@ -137,7 +135,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)


@@ -150,9 +148,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()


@@ -249,7 +247,7 @@ bool wxRadioBox::Show( bool show )
 
     wxWindow::Show( show );
 
 
     wxWindow::Show( show );
 

-    if ((m_windowStyle & wxNO_BORDER) == 0)
+    if ((m_windowStyle & wxNO_BORDER) != 0)

         gtk_widget_hide( m_widget );
     
     wxNode *node = m_boxes.First();
         gtk_widget_hide( m_widget );
     
     wxNode *node = m_boxes.First();


@@ -389,9 +387,10 @@ void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
     wxFAIL_MSG(_T("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)


@@ -402,6 +401,8 @@ 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 )