From 83058c584ffe23c0766665ff58e2bf5bc680b129 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 7 Sep 1998 14:44:38 +0000 Subject: [PATCH] wxProp now intercepts EVT_TEXT_ENTER instead of EVT_TEXT Added Checkbox::SetLabel git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- TODO.txt | 1 + include/wx/gtk/checkbox.h | 4 +++- include/wx/gtk1/checkbox.h | 4 +++- src/gtk/checkbox.cpp | 10 +++++++++- src/gtk/tbargtk.cpp | 7 ++++--- src/gtk1/checkbox.cpp | 10 +++++++++- src/gtk1/tbargtk.cpp | 7 ++++--- utils/wxprop/src/proplist.cpp | 2 +- 8 files changed, 34 insertions(+), 11 deletions(-) diff --git a/TODO.txt b/TODO.txt index fe11d23cd6..5c5874812c 100644 --- a/TODO.txt +++ b/TODO.txt @@ -38,5 +38,6 @@ Implement wxPalette Implement wxDirDialog Implement CopyOnWrite (unshare) for GDI objects Support cooperation between Qt and wxWindows +Fix toolbar tips TrueType support (just kidding) diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h index 8022f9c419..d83a8d59ea 100644 --- a/include/wx/gtk/checkbox.h +++ b/include/wx/gtk/checkbox.h @@ -58,7 +58,9 @@ class wxCheckBox: public wxControl const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr ); void SetValue( bool state ); - bool GetValue(void) const; + bool GetValue() const; + + void SetLabel( const wxString& label ); void SetFont( const wxFont &font ); void Enable( bool enable ); }; diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h index 8022f9c419..d83a8d59ea 100644 --- a/include/wx/gtk1/checkbox.h +++ b/include/wx/gtk1/checkbox.h @@ -58,7 +58,9 @@ class wxCheckBox: public wxControl const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr ); void SetValue( bool state ); - bool GetValue(void) const; + bool GetValue() const; + + void SetLabel( const wxString& label ); void SetFont( const wxFont &font ); void Enable( bool enable ); }; diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index d710aa4fcf..e50abc4759 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -83,12 +83,20 @@ void wxCheckBox::SetValue( bool state ) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_NORMAL ); } -bool wxCheckBox::GetValue(void) const +bool wxCheckBox::GetValue() const { GtkToggleButton *tb = GTK_TOGGLE_BUTTON(m_widget); return tb->active; } +void wxCheckBox::SetLabel( const wxString& label ) +{ + wxControl::SetLabel( label ); + GtkButton *bin = GTK_BUTTON( m_widget ); + GtkLabel *g_label = GTK_LABEL( bin->child ); + gtk_label_set( g_label, GetLabel() ); +} + void wxCheckBox::Enable( bool enable ) { wxControl::Enable( enable ); diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 1ced090e50..57bd59292e 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -78,7 +78,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), tool->m_owner->OnMouseEnter( tool->m_index ); - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- @@ -188,8 +188,9 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON; if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON; - tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, (GtkWidget *) NULL, (const char *) NULL, helpString1, "", tool_pixmap, - (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); + tool->m_item = gtk_toolbar_append_element( + m_toolbar, ctype, (GtkWidget *) NULL, (const char *) NULL, helpString1, "", + tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); gtk_signal_connect( GTK_OBJECT(tool->m_item), "enter_notify_event", GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), (gpointer)tool ); diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index d710aa4fcf..e50abc4759 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -83,12 +83,20 @@ void wxCheckBox::SetValue( bool state ) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_NORMAL ); } -bool wxCheckBox::GetValue(void) const +bool wxCheckBox::GetValue() const { GtkToggleButton *tb = GTK_TOGGLE_BUTTON(m_widget); return tb->active; } +void wxCheckBox::SetLabel( const wxString& label ) +{ + wxControl::SetLabel( label ); + GtkButton *bin = GTK_BUTTON( m_widget ); + GtkLabel *g_label = GTK_LABEL( bin->child ); + gtk_label_set( g_label, GetLabel() ); +} + void wxCheckBox::Enable( bool enable ) { wxControl::Enable( enable ); diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 1ced090e50..57bd59292e 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -78,7 +78,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), tool->m_owner->OnMouseEnter( tool->m_index ); - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- @@ -188,8 +188,9 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON; if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON; - tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, (GtkWidget *) NULL, (const char *) NULL, helpString1, "", tool_pixmap, - (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); + tool->m_item = gtk_toolbar_append_element( + m_toolbar, ctype, (GtkWidget *) NULL, (const char *) NULL, helpString1, "", + tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); gtk_signal_connect( GTK_OBJECT(tool->m_item), "enter_notify_event", GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), (gpointer)tool ); diff --git a/utils/wxprop/src/proplist.cpp b/utils/wxprop/src/proplist.cpp index edfc2aaa4e..e086dd2377 100644 --- a/utils/wxprop/src/proplist.cpp +++ b/utils/wxprop/src/proplist.cpp @@ -1719,7 +1719,7 @@ BEGIN_EVENT_TABLE(wxPropertyStringListEditorDialog, wxDialog) EVT_BUTTON(wxID_PROP_SL_ADD, wxPropertyStringListEditorDialog::OnAdd) EVT_BUTTON(wxID_PROP_SL_DELETE, wxPropertyStringListEditorDialog::OnDelete) EVT_LISTBOX(wxID_PROP_SL_STRINGS, wxPropertyStringListEditorDialog::OnStrings) - EVT_TEXT(wxID_PROP_SL_TEXT, wxPropertyStringListEditorDialog::OnText) + EVT_TEXT_ENTER(wxID_PROP_SL_TEXT, wxPropertyStringListEditorDialog::OnText) END_EVENT_TABLE() class wxPropertyStringListEditorText: public wxTextCtrl -- 2.47.2