General tidy-up (mainly typecasts) to allow the use of the SGI native

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 7205e098c58630accee6d3a1d75fa5144ddf6df6..066c92a17a5c826ec16c36254107dac71b4af92a 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -40,33 +40,28 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
   button->GetEventHandler()->ProcessEvent(event);
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
   button->GetEventHandler()->ProcessEvent(event);

-};
+}

 
 //-----------------------------------------------------------------------------
 
 wxButton::wxButton(void)
 {
 
 //-----------------------------------------------------------------------------
 
 wxButton::wxButton(void)
 {

-};
-
-wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-  Create( parent, id, label, pos, size, style, name );
-};
+}

 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,
 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,

-      long style, const wxString &name )
+      long style, const wxValidator& validator, const wxString &name )

 {
   m_needParent = TRUE;
 
   wxSize newSize = size;
 
   PreCreation( parent, id, pos, newSize, style, name );
 {
   m_needParent = TRUE;
 
   wxSize newSize = size;
 
   PreCreation( parent, id, pos, newSize, style, name );

+  
+  SetValidator( validator );

 
 

-  SetLabel(label);

   m_widget = gtk_button_new_with_label( m_label );
   m_widget = gtk_button_new_with_label( m_label );

+  SetLabel(label);

 
   if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;
 
   if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;


@@ -80,17 +75,29 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
   Show( TRUE );
 
   return TRUE;
   Show( TRUE );
 
   return TRUE;

-};
+}

 
 void wxButton::SetDefault(void)
 {
 
 void wxButton::SetDefault(void)
 {

-};
+/*
+  GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+  gtk_widget_grab_default( m_widget );
+*/
+}

 
 void wxButton::SetLabel( const wxString &label )
 {
   wxControl::SetLabel( label );
 
 void wxButton::SetLabel( const wxString &label )
 {
   wxControl::SetLabel( label );

-  GtkBin *bin = GTK_BIN( m_widget );
+  GtkButton *bin = GTK_BUTTON( m_widget );

   GtkLabel *g_label = GTK_LABEL( bin->child );
   gtk_label_set( g_label, GetLabel() );
   GtkLabel *g_label = GTK_LABEL( bin->child );
   gtk_label_set( g_label, GetLabel() );

-};
+}
+
+void wxButton::Enable( bool enable )
+{
+  wxControl::Enable( enable );
+  GtkButton *bin = GTK_BUTTON( m_widget );
+  GtkWidget *label = bin->child;
+  gtk_widget_set_sensitive( label, enable );
+}