X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a696db453c79ff58509195244bcf260dfdf13c81..458425003481da3dde531a9677014b07070b7095:/src/gtk1/button.cpp

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 711b64f16c..b61143a0ef 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -175,7 +175,12 @@ void wxButton::SetLabel( const wxString &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() ) );
+#endif
 }
 
 bool wxButton::Enable( bool enable )
@@ -188,6 +193,15 @@ bool wxButton::Enable( bool enable )
     return TRUE;
 }
 
+bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+{
+#ifdef __WXGTK20__
+    return GTK_BUTTON(m_widget)->event_window;
+#else
+    return (window == m_widget->window);
+#endif
+}
+
 void wxButton::ApplyWidgetStyle()
 {
     SetWidgetStyle();