some common code moved from wxWindow/wxFrame into files in common subdir

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 9c167dc0fb02a758ab9d4aa8d0d2787002694809..2201232c15fe35fc7801b18f8b180c4d062281f7 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -41,39 +41,39 @@ wxButton::wxButton(void)
 };
 
 wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
 };
 
 wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,

-      const wxPoint &pos, const wxSize &size, 
+      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,
       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, 
+      const wxPoint &pos, const wxSize &size,

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

-  
+

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

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

   if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
   if (newSize.x == -1) newSize.x = 15+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_button_clicked_callback), (gpointer*)this );
 
   PostCreation();
     GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
   PostCreation();

-  
+

   Show( TRUE );
   Show( TRUE );

-    
+

   return TRUE;
 };
   return TRUE;
 };

-      
+

 void wxButton::SetDefault(void)
 {
 };
 void wxButton::SetDefault(void)
 {
 };