fixed warnings, reformatted braces

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index b33fd486e6f73eb78fd75af68fa90049cb637e78..a85a9b4acfedea5d1df16a0ae325e4c5867372b5 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -1,38 +1,56 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
-#endif
+#if wxUSE_CHECKBOX

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

+#include "wx/gtk1/private.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool           g_blockEventsOnDrag;
+extern wxCursor       g_globalCursor;
+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 *widget, wxCheckBox *cb)

 {
 {

-  if (!cb->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
-  event.SetInt( cb->GetValue() );
-  event.SetEventObject(cb);
-  cb->GetEventHandler()->ProcessEvent(event);
+    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());
+    event.SetInt(cb->GetValue());
+    event.SetEventObject(cb);
+    cb->GetEventHandler()->ProcessEvent(event);
+}

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


@@ -41,101 +59,160 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 

-wxCheckBox::wxCheckBox(void)
+wxCheckBox::wxCheckBox()

 {
 }
 
 {
 }
 

-bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxValidator& validator, const wxString &name )
+bool wxCheckBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString &label,
+                        const wxPoint &pos,
+                        const wxSize &size,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString &name )

 {
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-
-  SetValidator( validator );
-
-  m_widget = gtk_check_button_new_with_label( m_label );
- 
-  wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = 25+gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
-   
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );
-    
-  PostCreation();
-  
-  gtk_widget_realize( GTK_BUTTON( m_widget )->child );
-  
-  SetLabel( label );
-
-  SetBackgroundColour( parent->GetBackgroundColour() );
-
-  Show( TRUE );
-    
-  return 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") );
+        return false;
+    }
+
+    wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
+                  (style & wxCHK_3STATE) != 0,
+                  wxT("Using wxCHK_ALLOW_3RD_STATE_FOR_USER")
+                  wxT(" style flag for a 2-state checkbox is useless") );
+
+    if ( style & wxALIGN_RIGHT )
+    {
+        // VZ: as I don't know a way to create a right aligned checkbox with
+        //     GTK we will create a checkbox without label and a label at the
+        //     left of it
+        m_widgetCheckbox = gtk_check_button_new();
+
+        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_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);
+
+        gtk_widget_show( m_widgetLabel );
+        gtk_widget_show( m_widgetCheckbox );
+    }
+    else
+    {
+        m_widgetCheckbox = gtk_check_button_new_with_label("");
+        m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
+        m_widget = m_widgetCheckbox;
+    }
+    SetLabel( label );
+
+    gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
+                        "toggled",
+                        GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback),
+                        (gpointer *)this );
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;

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

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") );

 
 

-  if (state)
-    gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_ACTIVE );
-  else
-    gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_NORMAL );
+    if (state == GetValue())
+        return;
+
+    m_blockEvent = true;
+
+    gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
+
+    m_blockEvent = false;

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

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

 
 

-  return GTK_TOGGLE_BUTTON(m_widget)->active;
+    return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;

 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );

 
 

-  wxControl::SetLabel( label );
-  
-  gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
+    GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);

 }
 
 }
 

-void wxCheckBox::Enable( bool enable )
+bool wxCheckBox::Enable( bool enable )

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    if ( !wxControl::Enable( enable ) )
+        return false;

 
 

-  wxControl::Enable( enable );
-  
-  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    gtk_widget_set_sensitive( m_widgetLabel, enable );
+
+    return true;

 }
 
 }
 

-void wxCheckBox::SetFont( const wxFont &font )
+void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+    gtk_widget_modify_style(m_widgetCheckbox, style);
+    gtk_widget_modify_style(m_widgetLabel, style);
+}

 
 

-  wxControl::SetFont( font );
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
+bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
+{
+    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);

 }
 
 }
 

-void wxCheckBox::SetBackgroundColour( const wxColour &colour )
+void wxCheckBox::OnInternalIdle()

 {
 {

-  return;
+    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;
+        }
+    }
+
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}

 
 

-  wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
+wxSize wxCheckBox::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}

 
 

-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
+// static
+wxVisualAttributes
+wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);

 }
 
 }
 

+#endif