Moved the check for page scrolling with the wheel into wxMouseEvent so

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 09cdd98387c08afae679581a05a10ad268ce9a59..5e0dcb88f2b78c279c3929400df8c2c42452d084 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -12,10 +12,13 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_CHECKBOX
+
 #include "wx/checkbox.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -28,7 +31,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool           g_blockEventsOnDrag;
+extern wxCursor       g_globalCursor;
+extern wxWindowGTK   *g_delayedFocus;
 
 //-----------------------------------------------------------------------------
 // "clicked"
@@ -40,13 +45,9 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
 
     if (!cb->m_hasVMT) return;
 
-    if (cb->m_blockFirstEvent)
-    {
-        cb->m_blockFirstEvent = FALSE;
-        return;
-    }
-
     if (g_blockEventsOnDrag) return;
+    
+    if (cb->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
     event.SetInt( cb->GetValue() );
@@ -75,12 +76,15 @@ bool wxCheckBox::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
+    m_blockEvent = FALSE;
 
-    PreCreation( parent, id, pos, size, style, name );
-
-    m_blockFirstEvent = FALSE;
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxCheckBox creation failed") );
+        return FALSE;
+    }
 
-    SetValidator( validator );
     wxControl::SetLabel( label );
 
     if ( style & wxALIGN_RIGHT )
@@ -97,28 +101,16 @@ bool wxCheckBox::Create(wxWindow *parent,
         gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3);
         gtk_box_pack_start(GTK_BOX(m_widget), m_widgetCheckbox, FALSE, FALSE, 3);
 
-        // VZ: why do I have to do this to make them appear?
         gtk_widget_show( m_widgetLabel );
         gtk_widget_show( m_widgetCheckbox );
     }
     else
     {
         m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
-        m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
+        m_widgetLabel = BUTTON_CHILD( 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 );
-
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",
                         GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
@@ -128,9 +120,19 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     PostCreation();
 
+    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 );
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -139,28 +141,28 @@ bool wxCheckBox::Create(wxWindow *parent,
 
 void wxCheckBox::SetValue( bool state )
 {
-    wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
+    wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") );
 
-    if ( state == GetValue() )
+    if (state == GetValue())
         return;
 
-    // for compatibility with wxMSW don't send notification when the check box
-    // state is changed programmatically
-    m_blockFirstEvent = TRUE;
+    m_blockEvent = TRUE;
 
     gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
+
+    m_blockEvent = FALSE;
 }
 
 bool wxCheckBox::GetValue() const
 {
-    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") );
+    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
-    wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
+    wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
 
     wxControl::SetLabel( label );
 
@@ -184,3 +186,42 @@ void wxCheckBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
 }
 
+bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
+{
+    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+}
+
+void wxCheckBox::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    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
+           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() );
+    }
+
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            gtk_widget_grab_focus( m_widget );
+            g_delayedFocus = NULL;
+        }
+    }
+    
+    UpdateWindowUI();
+}
+
+wxSize wxCheckBox::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
+#endif