New attempt at getting constraints work

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index bfe45bdf3923e77210758e91c11dc568f51fc8d8..3e2dc3124cf938f2d6ab5f0a79e517300bc80f51 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/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"
 


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

 {
 }
 
 {
 }
 


@@ -84,7 +87,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     PreCreation( parent, id, pos, size, style, name );
 
 
     PreCreation( parent, id, pos, size, style, name );
 

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif

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


@@ -108,9 +113,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), 10, 10 );
+        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();


@@ -120,9 +125,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 +140,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 +153,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()


@@ -160,6 +163,14 @@ 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( "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 );


@@ -182,7 +193,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;


@@ -249,6 +260,9 @@ bool wxRadioBox::Show( bool show )
 
     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)
     {


@@ -386,9 +400,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)


@@ -399,6 +414,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 )


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

+
+#endif