compilation fixes for gcc 2.7.2.1 under FreeBSD

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 9d594ca4951961223392b2431949f77061a6458f..c3fa1a8749cd2c29a0427a2689e7bb3f9c4e5f3d 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

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


@@ -14,6 +14,9 @@
 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

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


@@ -27,15 +30,15 @@ extern bool   g_blockEventsOnDrag;
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {
     if (!cb->HasVMT()) return;
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {
     if (!cb->HasVMT()) return;

-  
+

     if (cb->m_blockFirstEvent)
     {
         cb->m_blockFirstEvent = FALSE;
         return;
     if (cb->m_blockFirstEvent)
     {
         cb->m_blockFirstEvent = FALSE;
         return;

-    } 
-  
+    }
+

     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnDrag) return;

-  
+

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


@@ -53,50 +56,50 @@ wxCheckBox::wxCheckBox(void)
 }
 
 bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 }
 
 bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label,

-      const wxPoint &pos, const wxSize &size, 
+      const wxPoint &pos, const wxSize &size,

       long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
       long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

-  
+

     PreCreation( parent, id, pos, size, style, name );
 
     SetValidator( validator );
 
     m_widget = gtk_check_button_new_with_label( m_label );
     PreCreation( parent, id, pos, size, style, name );
 
     SetValidator( validator );
 
     m_widget = gtk_check_button_new_with_label( m_label );

- 
+

     m_blockFirstEvent = FALSE;
     m_blockFirstEvent = FALSE;

-  
+

     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 );
     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_connect( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );

-    
+

     m_parent->AddChild( this );
 
     (m_parent->m_insertCallback)( m_parent, this );
     m_parent->AddChild( this );
 
     (m_parent->m_insertCallback)( m_parent, this );

-  
+

     PostCreation();
     PostCreation();

-  
+

     gtk_widget_realize( GTK_BUTTON( m_widget )->child );
     gtk_widget_realize( GTK_BUTTON( m_widget )->child );

-  
+

     SetLabel( label );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
     SetLabel( label );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );

-    
+

     return TRUE;
 }
 
 void wxCheckBox::SetValue( bool state )
 {
     wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
     return TRUE;
 }
 
 void wxCheckBox::SetValue( bool state )
 {
     wxCHECK_RET( m_widget != NULL, "invalid checkbox" );

-    
+

     if ( state == GetValue() )
         return;
 
     if ( state == GetValue() )
         return;
 


@@ -119,7 +122,7 @@ void wxCheckBox::SetLabel( const wxString& label )
     wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
 
     wxControl::SetLabel( label );
     wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
 
     wxControl::SetLabel( label );

-  
+

     gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
 }
 
     gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
 }
 


@@ -128,7 +131,7 @@ void wxCheckBox::Enable( bool enable )
     wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
 
     wxControl::Enable( enable );
     wxCHECK_RET( m_widget != NULL, "invalid checkbox" );
 
     wxControl::Enable( enable );

-  
+

     gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
 }
 
     gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
 }