projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Addition at simple wxObject*, support into wxVariant.
[wxWidgets.git]
/
src
/
gtk1
/
button.cpp
diff --git
a/src/gtk1/button.cpp
b/src/gtk1/button.cpp
index 711b64f16ca1949896f7725f3275f6ab524ec373..b61143a0ef7b5fd5dc0a1a43968810024e414c7d 100644
(file)
--- a/
src/gtk1/button.cpp
+++ b/
src/gtk1/button.cpp
@@
-175,7
+175,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 )
@@
-188,6
+193,15
@@
bool wxButton::Enable( bool enable )
return TRUE;
}
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();
void wxButton::ApplyWidgetStyle()
{
SetWidgetStyle();