color must not be set for wxMac

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 060c3a127c38e2296953138510c54f51ed8b7f93..2a7d0437bf6b44c4c240e42a8f7ca642c2b22e0f 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -8,16 +8,20 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

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

 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

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

 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/checkbox.h"
+
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -30,8 +34,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool       g_blockEventsOnDrag;
-extern wxCursor   g_globalCursor;
+extern bool           g_blockEventsOnDrag;
+extern wxCursor       g_globalCursor;
+extern wxWindowGTK   *g_delayedFocus;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 
 //-----------------------------------------------------------------------------
 // "clicked"


@@ -44,6 +49,8 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;

+    
+    if (cb->m_blockEvent) return;

 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     event.SetInt( cb->GetValue() );
 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     event.SetInt( cb->GetValue() );


@@ -72,16 +79,15 @@ bool wxCheckBox::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

+    m_blockEvent = FALSE;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxCheckBox creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxCheckBox creation failed") );

-       return FALSE;
+        return FALSE;

     }
 
     }
 

-    wxControl::SetLabel( label );
-

     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with
     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with


@@ -89,7 +95,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 

-        m_widgetLabel = gtk_label_new(m_label.mbc_str());
+        m_widgetLabel = gtk_label_new("");

         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);


@@ -101,21 +107,11 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
     }
     else
     {

-        m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
-        m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
+        m_widgetCheckbox = gtk_check_button_new_with_label("");
+        m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );

         m_widget = m_widgetCheckbox;
     }
         m_widget = m_widgetCheckbox;
     }

-
-    wxSize newSize(size);
-    if (newSize.x == -1)
-    {
-        newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
-                                             m_label.mbc_str() );
-    }
-    if (newSize.y == -1)
-        newSize.y = 26;
-
-    SetSize( newSize.x, newSize.y );
+    SetLabel( label );

 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",


@@ -125,10 +121,16 @@ bool wxCheckBox::Create(wxWindow *parent,
     m_parent->DoAddChild( this );
 
     PostCreation();
     m_parent->DoAddChild( this );
 
     PostCreation();

+    InheritAttributes();

 
 

-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -142,16 +144,11 @@ void wxCheckBox::SetValue( bool state )
     if (state == GetValue())
         return;
 
     if (state == GetValue())
         return;
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widgetCheckbox),
-                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
-                        (gpointer *)this );
+    m_blockEvent = TRUE;

 
     gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
 
     gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );

-    
-    gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
-                        "clicked",
-                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
-                        (gpointer *)this );
+
+    m_blockEvent = FALSE;

 }
 
 bool wxCheckBox::GetValue() const
 }
 
 bool wxCheckBox::GetValue() const


@@ -167,7 +164,12 @@ void wxCheckBox::SetLabel( const wxString& label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

-    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( GTK_LABEL(m_widgetLabel), wxGTK_CONV( label2 ) );
+#else
+    gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );
+#endif

 }
 
 bool wxCheckBox::Enable( bool enable )
 }
 
 bool wxCheckBox::Enable( bool enable )


@@ -189,7 +191,7 @@ void wxCheckBox::ApplyWidgetStyle()
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 {

-    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);

 }
 
 void wxCheckBox::OnInternalIdle()
 }
 
 void wxCheckBox::OnInternalIdle()


@@ -197,17 +199,33 @@ void wxCheckBox::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok())
+    GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox);
+    if ( event_window && cursor.Ok() )

     {
         /* I now set the cursor the anew in every OnInternalIdle call
     {
         /* I now set the cursor the anew in every OnInternalIdle call

-          as setting the cursor in a parent window also effects the
-          windows above so that checking for the current cursor is
-          not possible. */
-          
-       gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() );
+           as setting the cursor in a parent window also effects the
+           windows above so that checking for the current cursor is
+           not possible. */
+
+       gdk_window_set_cursor( event_window, cursor.GetCursor() );

     }
 
     }
 

-    UpdateWindowUI();
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            gtk_widget_grab_focus( m_widget );
+            g_delayedFocus = NULL;
+        }
+    }
+    
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+wxSize wxCheckBox::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();

 }
 
 #endif
 }
 
 #endif