no message

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

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 6588daad60de53fcd677662b5d5a5eb1bb3325a8..034e229f1843b48a0f1902dab60c02806eb628b1 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -27,11 +27,9 @@ class wxButton;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxButton
+// "clicked"

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

-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-

 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
   if (!button->HasVMT()) return;
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
   if (!button->HasVMT()) return;


@@ -40,30 +38,29 @@ 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::wxButton(void)
-{
-};
+IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)

 
 

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

 {
 {

-  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 );

 
   m_widget = gtk_button_new_with_label( m_label );
   SetLabel(label);
 
   m_widget = gtk_button_new_with_label( m_label );
   SetLabel(label);


@@ -80,11 +77,15 @@ 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 )
 {
 
 void wxButton::SetLabel( const wxString &label )
 {


@@ -92,5 +93,39 @@ void wxButton::SetLabel( const wxString &label )
   GtkButton *bin = GTK_BUTTON( m_widget );
   GtkLabel *g_label = GTK_LABEL( bin->child );
   gtk_label_set( g_label, GetLabel() );
   GtkButton *bin = GTK_BUTTON( m_widget );
   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 );
+}
+
+void wxButton::SetFont( const wxFont &font )
+{
+  if (((wxFont*)&font)->Ok())
+    m_font = font;
+  else
+    m_font = *wxSWISS_FONT;

 
 

+  GtkButton *bin = GTK_BUTTON( m_widget );
+  GtkWidget *label = bin->child;
+  
+  GtkStyle *style = (GtkStyle*) NULL;
+  if (!m_hasOwnStyle)
+  {
+    m_hasOwnStyle = TRUE;
+    style = gtk_style_copy( gtk_widget_get_style( label ) );
+  }
+  else
+  {
+    style = gtk_widget_get_style( label );
+  }
+  
+  gdk_font_unref( style->font );
+  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+  
+  gtk_widget_set_style( label, style );
+}