corrected bitmap mask -> Image conversion

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 855f838e87afe52993699c1a109bfbe3301aa2ce..04050c30dd3583afee670ea13d6904854c20c291 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -7,11 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 


@@ -122,7 +123,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
     }
     else if ( !win->m_hasFocus )
     {
     }
     else if ( !win->m_hasFocus )
     {

-        win->m_hasFocus = TRUE;
+        win->m_hasFocus = true;

 
         wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
         event.SetEventObject( win );
 
         wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
         event.SetEventObject( win );


@@ -146,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
 
     // 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;
 }
 
     return FALSE;
 }


@@ -160,11 +161,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 void wxRadioBox::Init()
 {
 
 void wxRadioBox::Init()
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
     m_hasFocus =
 
     m_hasFocus =

-    m_lostFocus = FALSE;
+    m_lostFocus = false;
+}
+
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& title,
+                         const wxPoint &pos, const wxSize &size,
+                         const wxArrayString& choices, int majorDim,
+                         long style, const wxValidator& validator,
+                         const wxString &name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, title, pos, size, chs.GetCount(),
+                   chs.GetStrings(), majorDim, style, validator, name );

 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,


@@ -177,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") );
         !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 ) );
     }
 
     m_widget = gtk_frame_new( wxGTK_CONV( title ) );


@@ -229,33 +243,18 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    ApplyWidgetStyle();
+    bool wasShown = IsShown();
+    if ( wasShown )
+        Hide(); // prevent PostCreation() from showing us

 
     SetLabel( title );
 
 
     SetLabel( title );
 

-    SetFont( parent->GetFont() );
-
-    wxSize ls = LayoutItems();
-
-    GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
-    if (req.width > ls.x) ls.x = req.width;
-
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = ls.x;
-    if (newSize.y == -1) newSize.y = ls.y;
-    SetSize( newSize.x, newSize.y );
+    PostCreation(size);

 
 

-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
+    if ( wasShown )
+        Show();

 
 

-    Show( TRUE );
-
-    return TRUE;
+    return true;

 }
 
 wxRadioBox::~wxRadioBox()
 }
 
 wxRadioBox::~wxRadioBox()


@@ -273,25 +272,35 @@ void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 

-    LayoutItems();
+    LayoutItems(false);

 }
 
 }
 

-wxSize wxRadioBox::LayoutItems()
+wxSize wxRadioBox::DoGetBestSize() const

 {
 {

-    int x = 7;
-    int y = 15;
+    wxSize size = LayoutItems(true);

 
 

-    if ( m_majorDim == 0 )
-    {
-        // avoid dividing by 0 below
-        wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
+    if (req.width > size.x)
+        size.x = req.width;

 
 

-        m_majorDim = 1;
-    }
+    CacheBestSize(size);
+    return size;
+}
+
+wxSize wxRadioBox::LayoutItems(bool justCalc) const
+{
+    wxSize res( 0, 0 );
+
+    // avoid dividing by 0 below
+    wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );

 
     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
 
 
     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
 

-    wxSize res( 0, 0 );
+    int x = 7;
+    int y = 15;

 
     int num_of_cols = 0;
     int num_of_rows = 0;
 
     int num_of_cols = 0;
     int num_of_rows = 0;


@@ -306,12 +315,15 @@ wxSize wxRadioBox::LayoutItems()
         num_of_rows = m_majorDim;
     }
 
         num_of_rows = m_majorDim;
     }
 

+    int lineheight = GetCharHeight()+2;
+

     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
         for (int j = 0; j < num_of_cols; j++)
         {
     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
         for (int j = 0; j < num_of_cols; j++)
         {

-            y = 15;
+            y = 3;
+            y += lineheight;

 
             int max_len = 0;
             wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows );
 
             int max_len = 0;
             wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows );


@@ -327,7 +339,8 @@ wxSize wxRadioBox::LayoutItems()
 
                 if (req.width > max_len) max_len = req.width;
 
 
                 if (req.width > max_len) max_len = req.width;
 

-                gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
+                if ( !justCalc )
+                    gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );

                 y += req.height;
 
                 node = node->GetNext();
                 y += req.height;
 
                 node = node->GetNext();


@@ -341,7 +354,8 @@ wxSize wxRadioBox::LayoutItems()
             {
                 GtkWidget *button = GTK_WIDGET( node->GetData() );
 
             {
                 GtkWidget *button = GTK_WIDGET( node->GetData() );
 

-                gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
+                if ( !justCalc )
+                    gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );

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


@@ -380,7 +394,8 @@ wxSize wxRadioBox::LayoutItems()
         {
             GtkWidget *button = GTK_WIDGET( node->GetData() );
 
         {
             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 );
+            if ( !justCalc )
+                gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );

             x += max;
 
             node = node->GetNext();
             x += max;
 
             node = node->GetNext();


@@ -394,15 +409,15 @@ wxSize wxRadioBox::LayoutItems()
 
 bool wxRadioBox::Show( bool show )
 {
 
 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
 
     if (!wxControl::Show(show))
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     }
 

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

         gtk_widget_hide( m_widget );
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
         gtk_widget_hide( m_widget );
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();


@@ -415,7 +430,7 @@ bool wxRadioBox::Show( bool show )
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return TRUE;
+    return true;

 }
 
 int wxRadioBox::FindString( const wxString &find ) const
 }
 
 int wxRadioBox::FindString( const wxString &find ) const


@@ -544,7 +559,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )

-        return FALSE;
+        return false;

 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)


@@ -557,7 +572,7 @@ bool wxRadioBox::Enable( bool enable )
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return TRUE;
+    return true;

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


@@ -619,13 +634,13 @@ wxString wxRadioBox::GetStringSelection() const
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
 {
 
 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 );
 
     int res = FindString( s );

-    if (res == -1) return FALSE;
+    if (res == -1) return false;

     SetSelection( res );
 
     SetSelection( res );
 

-    return TRUE;
+    return true;

 }
 
 int wxRadioBox::GetCount() const
 }
 
 int wxRadioBox::GetCount() const


@@ -633,16 +648,6 @@ int wxRadioBox::GetCount() const
     return m_boxes.GetCount();
 }
 
     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();
 void wxRadioBox::GtkDisableEvents()
 {
     wxList::compatibility_iterator node = m_boxes.GetFirst();


@@ -667,19 +672,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() );
 
     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();
     }
 
         node = node->GetNext();
     }


@@ -700,27 +707,27 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 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() );
 
 
     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();
     }
 
 
         node = node->GetNext();
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxRadioBox::OnInternalIdle()
 {
     if ( m_lostFocus )
     {
 }
 
 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 );
 
         wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
         event.SetEventObject( this );


@@ -738,5 +745,38 @@ void wxRadioBox::OnInternalIdle()
     }
 }
 
     }
 }
 

+// static
+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(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
 
 #endif // wxUSE_RADIOBOX