compilation fixes

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 57c712db39544ca8f97ba6ee313ddb7f5497b1e9..f4ff061e921fd49cbcc8d6f076f3bb4887c22664 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -2,10 +2,9 @@
 // Name:        checkbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        checkbox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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


@@ -13,72 +12,208 @@
 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_CHECKBOX
+

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

+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxCheckBox
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+// data
+//-----------------------------------------------------------------------------
+
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;

 
 

-void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+//-----------------------------------------------------------------------------
+// "clicked"
+//-----------------------------------------------------------------------------
+
+static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )

 {
 {

-  wxCheckBox *cb = (wxCheckBox*)data;
-  wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
-  event.SetInt( cb->GetValue() );
-  event.SetEventObject(cb);
-  cb->ProcessEvent(event);
-};
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!cb->m_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);
+}
+
+//-----------------------------------------------------------------------------
+// wxCheckBox

 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 

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

 {
 {

-};
+}

 
 

-wxCheckBox::wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
-      const long style, 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 )

 {
 {

-  Create( parent, id, label, pos, size, style, name );
-};
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxCheckBox creation failed") );
+        return FALSE;
+    }
+
+    wxControl::SetLabel( label );
+
+    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(m_label.mbc_str());
+        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_label.mbc_str() );
+        m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
+        m_widget = m_widgetCheckbox;
+    }
+
+    gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
+                        "clicked",
+                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+                        (gpointer *)this );
+
+    m_parent->DoAddChild( this );
+
+    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 );

 
 

-bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name )
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+
+    Show( TRUE );
+
+    return TRUE;
+}
+
+void wxCheckBox::SetValue( bool state )
+{
+    wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") );
+
+    if (state == GetValue())
+        return;
+
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widgetCheckbox),
+                        GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+                        (gpointer *)this );
+
+    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 );
+}
+
+bool wxCheckBox::GetValue() const

 {
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-
-  m_widget = gtk_check_button_new_with_label( 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();
-  
-  Show( TRUE );
-    
-  return TRUE;
-};
-
-void wxCheckBox::SetValue( const bool state )
+    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
+
+    return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
+}
+
+void wxCheckBox::SetLabel( const wxString& label )

 {
 {

-  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 );
-};
+    wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );

 
 

-bool wxCheckBox::GetValue(void) const
+    wxControl::SetLabel( label );
+
+    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
+}
+
+bool wxCheckBox::Enable( bool enable )

 {
 {

-  GtkToggleButton *tb = GTK_TOGGLE_BUTTON(m_widget);
-  return tb->active;
-};
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;
+
+    gtk_widget_set_sensitive( m_widgetLabel, enable );

 
 

+    return TRUE;
+}
+
+void wxCheckBox::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle );
+    gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
+}
+
+bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
+{
+    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+}
+
+void wxCheckBox::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->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( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );
+    }
+
+    UpdateWindowUI();
+}
+
+wxSize wxCheckBox::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
+#endif