call wxApp::OnExceptionInMainLoop() when an exception occurs (refactored the change...

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

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index fae04c137284c4431fd4643f205258b334e1f999..a3f112390869fb1c1d7d009c5ae67c7f6fc22d69 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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


@@ -133,8 +136,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     m_parent->DoAddChild( this );
 
     PostCreation();
     m_parent->DoAddChild( this );
 
     PostCreation();

-
-    SetFont( parent->GetFont() );
+    InheritAttributes();

 
     wxSize best_size( DoGetBestSize() );
     wxSize new_size( size );
 
     wxSize best_size( DoGetBestSize() );
     wxSize new_size( size );


@@ -147,9 +149,6 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 
     SetSize( new_size );
 
 
     SetSize( new_size );
 

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

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


@@ -175,7 +174,12 @@ void wxButton::SetLabel( const wxString &label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 bool wxButton::Enable( bool enable )
 }
 
 bool wxButton::Enable( bool enable )


@@ -208,6 +212,10 @@ wxSize wxButton::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
 
 {
     wxSize ret( wxControl::DoGetBestSize() );
 

+#ifndef __WXGTK20__
+    ret.x += 10;  // add a few pixels for sloppy (but common) themes
+#endif
+    

     if (!HasFlag(wxBU_EXACTFIT))
     {
         if (ret.x < 80) ret.x = 80;
     if (!HasFlag(wxBU_EXACTFIT))
     {
         if (ret.x < 80) ret.x = 80;