Made widgets sample take up less space

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e1099660546cd92f80e5bb901f228c5befc4da68..31fd1bd0896ca92449e340f1aae2ccf7cfa88b69 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -4,17 +4,20 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "button.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "button.h"
 #endif
 

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

 #include "wx/button.h"
 
 #include "wx/button.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -41,12 +44,12 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
 
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

        wxapp_install_idle_handler();
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
        wxapp_install_idle_handler();
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-    
+

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


@@ -64,64 +67,86 @@ wxButton::wxButton()
 
 wxButton::~wxButton()
 {
 
 wxButton::~wxButton()
 {

-    if (m_clientData) delete m_clientData;

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

-    m_clientData = (wxClientData*) NULL;

     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {

-        wxFAIL_MSG( _T("wxButton creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxButton creation failed") );
+        return FALSE;

     }
 
     }
 

+/*
+    wxString label2( label );
+    for (size_t i = 0; i < label2.Len(); i++)
+    {
+        if (label2.GetChar(i) == wxT('&'))
+        label2.SetChar(i,wxT('_'));
+    }

 
 

-    m_widget = gtk_button_new_with_label( "" );
-    
-#if (GTK_MINOR_VERSION > 0)    
-    if (style & wxNO_BORDER)
-       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
-#endif
+    GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
+    gtk_widget_show( accel_label );

 
 

-    SetLabel(label);
+    m_widget = gtk_button_new();
+    gtk_container_add( GTK_CONTAINER(m_widget), accel_label );

 
 

-    int x = 0;  int y = 0;
-    wxFont new_font( parent->GetFont() );
-    GetTextExtent( m_label, &x, &y, (int*)NULL, (int*)NULL, &new_font );
+    gtk_accel_label_set_accel_widget( GTK_ACCEL_LABEL(accel_label), m_widget );

 
 

-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = 12+x;
-    if (newSize.y == -1) newSize.y = 11+y;
-    SetSize( newSize.x, newSize.y );
+    guint accel_key = gtk_label_parse_uline (GTK_LABEL(accel_label), label2.mb_str() );
+    gtk_accel_label_refetch( GTK_ACCEL_LABEL(accel_label) );
+
+    wxControl::SetLabel( label );
+*/
+
+    m_widget = gtk_button_new_with_label("");
+
+    SetLabel( label );
+
+#if (GTK_MINOR_VERSION > 0)
+    if (style & wxNO_BORDER)
+       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
+#endif

 
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     m_parent->DoAddChild( this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     m_parent->DoAddChild( this );

-  
+

     PostCreation();
     PostCreation();

-  
+
+    SetFont( parent->GetFont() );
+
+    wxSize best_size( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = best_size.x;
+    if (new_size.y == -1)
+        new_size.y = best_size.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+
+    SetSize( new_size );
+

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
     return TRUE;
 }
 
 
     Show( TRUE );
 
     return TRUE;
 }
 

-void wxButton::SetDefault(void)
+void wxButton::SetDefault()

 {
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 {
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );

-    
+

     SetSize( m_x, m_y, m_width, m_height );
 }
 
     SetSize( m_x, m_y, m_width, m_height );
 }
 


@@ -133,19 +158,19 @@ wxSize wxButton::GetDefaultSize()
 
 void wxButton::SetLabel( const wxString &label )
 {
 
 void wxButton::SetLabel( const wxString &label )
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+

     wxControl::SetLabel( label );
     wxControl::SetLabel( label );

-  
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );
+
+    gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), GetLabel().mbc_str() );

 }
 
 bool wxButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
         return FALSE;
 }
 
 bool wxButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
         return FALSE;

-  
-    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+
+    gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -154,5 +179,20 @@ void wxButton::ApplyWidgetStyle()
 {
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 {
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );

-    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );

 }
 }

+
+wxSize wxButton::DoGetBestSize() const
+{
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    if (!HasFlag(wxBU_EXACTFIT))
+    {
+        if (ret.x < 80) ret.x = 80;
+    }
+
+    return ret;
+}
+
+#endif // wxUSE_BUTTON
+