routing the tab, return events for single line fields back to standard wx handler...

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 2a7d0437bf6b44c4c240e42a8f7ca642c2b22e0f..c895b7c82cea1e7f4e48fb8a2e3b8556d3051117 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.cpp
+// Name:        src/gtk1/checkbox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,21 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checkbox.h"
-#endif
-

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

-#include "wx/defs.h"
-

 #if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
 
 #if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

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


@@ -42,20 +35,23 @@ extern wxWindowGTK   *g_delayedFocus;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "clicked"
 //-----------------------------------------------------------------------------
 

-static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
+extern "C" {
+static void gtk_checkbox_toggled_callback(GtkWidget *WXUNUSED(widget),
+                                          wxCheckBox *cb)

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!cb->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;

-    
+

     if (cb->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     if (cb->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());

-    event.SetInt( cb->GetValue() );
+    event.SetInt(cb->GetValue());

     event.SetEventObject(cb);
     event.SetEventObject(cb);

-    cb->GetEventHandler()->ProcessEvent(event);
+    cb->HandleWindowEvent(event);
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -77,15 +73,16 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString &name )
 {
                         const wxValidator& validator,
                         const wxString &name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-    m_blockEvent = FALSE;
+    m_needParent = true;
+    m_acceptsFocus = true;
+    m_blockEvent = false;

 
 

+    WXValidateStyle(&style);

     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;

     }
 
     if ( style & wxALIGN_RIGHT )
     }
 
     if ( style & wxALIGN_RIGHT )


@@ -114,27 +111,15 @@ bool wxCheckBox::Create(wxWindow *parent,
     SetLabel( label );
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
     SetLabel( label );
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),

-                        "clicked",
-                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+                        "toggled",
+                        GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback),

                         (gpointer *)this );
 
     m_parent->DoAddChild( this );
 
                         (gpointer *)this );
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-    InheritAttributes();
-
-    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 );
+    PostCreation(size);

 
 

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

 }
 
 void wxCheckBox::SetValue( bool state )
 }
 
 void wxCheckBox::SetValue( bool state )


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

-    m_blockEvent = TRUE;
+    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 );
 

-    m_blockEvent = FALSE;
+    m_blockEvent = false;

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

-    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
+    wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") );

 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }


@@ -162,31 +147,23 @@ void wxCheckBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
 
 {
     wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
 

-    wxControl::SetLabel( label );
-
-#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
+    GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);

 }
 
 bool wxCheckBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
 }
 
 bool wxCheckBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )

-        return FALSE;
+        return false;

 
     gtk_widget_set_sensitive( m_widgetLabel, enable );
 
 
     gtk_widget_set_sensitive( m_widgetLabel, enable );
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxCheckBox::ApplyWidgetStyle()
+void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle );
-    gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
+    gtk_widget_modify_style(m_widgetCheckbox, style);
+    gtk_widget_modify_style(m_widgetLabel, style);

 }
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
 }
 
 bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )


@@ -218,7 +195,7 @@ void wxCheckBox::OnInternalIdle()
             g_delayedFocus = NULL;
         }
     }
             g_delayedFocus = NULL;
         }
     }

-    
+

     if (wxUpdateUIEvent::CanUpdate(this))
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
     if (wxUpdateUIEvent::CanUpdate(this))
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }


@@ -228,4 +205,11 @@ wxSize wxCheckBox::DoGetBestSize() const
     return wxControl::DoGetBestSize();
 }
 
     return wxControl::DoGetBestSize();
 }
 

+// static
+wxVisualAttributes
+wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);
+}
+

 #endif
 #endif