From a9c96bcce94c48435f1949cd61658c72a1a5f2e4 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 15 Aug 1998 15:59:43 +0000 Subject: [PATCH] Added graying out of menus and buttons git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/button.h | 1 + include/wx/gtk/menu.h | 2 +- include/wx/gtk1/button.h | 1 + include/wx/gtk1/menu.h | 2 +- src/gtk/button.cpp | 8 ++++++++ src/gtk/menu.cpp | 7 +++++++ src/gtk1/button.cpp | 8 ++++++++ src/gtk1/menu.cpp | 7 +++++++ 8 files changed, 34 insertions(+), 2 deletions(-) diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 5adbd99d0c..0d5bf16b5c 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -59,6 +59,7 @@ class wxButton: public wxControl const wxString& name = wxButtonNameStr); void SetDefault(void); void SetLabel( const wxString &label ); + void Enable( bool enable ); }; #endif // __GTKBUTTONH__ diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 6e5232dd50..f3802598be 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -93,7 +93,7 @@ public: bool IsSubMenu() const { return m_subMenu != NULL; } // state - void Enable(bool enable = TRUE) { m_isEnabled = enable; } + void Enable( bool enable = TRUE ); bool IsEnabled() const { return m_isEnabled; } void Check( bool check = TRUE ); bool IsChecked() const; diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index 5adbd99d0c..0d5bf16b5c 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -59,6 +59,7 @@ class wxButton: public wxControl const wxString& name = wxButtonNameStr); void SetDefault(void); void SetLabel( const wxString &label ); + void Enable( bool enable ); }; #endif // __GTKBUTTONH__ diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index 6e5232dd50..f3802598be 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -93,7 +93,7 @@ public: bool IsSubMenu() const { return m_subMenu != NULL; } // state - void Enable(bool enable = TRUE) { m_isEnabled = enable; } + void Enable( bool enable = TRUE ); bool IsEnabled() const { return m_isEnabled; } void Check( bool check = TRUE ); bool IsChecked() const; diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index c90cf57996..066c92a17a 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -93,3 +93,11 @@ void wxButton::SetLabel( const wxString &label ) gtk_label_set( g_label, GetLabel() ); } +void wxButton::Enable( bool enable ) +{ + wxControl::Enable( enable ); + GtkButton *bin = GTK_BUTTON( m_widget ); + GtkWidget *label = bin->child; + gtk_widget_set_sensitive( label, enable ); +} + diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 6cd28ae420..39204142f1 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -208,6 +208,12 @@ void wxMenuItem::Check( bool check ) gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); } +void wxMenuItem::Enable( bool enable ) +{ + gtk_widget_set_sensitive( m_menuItem, enable ); + m_isEnabled = enable; +} + bool wxMenuItem::IsChecked() const { wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! @@ -259,6 +265,7 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool const char *text = mitem->GetText(); GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text) : gtk_menu_item_new_with_label(text); + mitem->SetMenuItem(menuItem); gtk_signal_connect( GTK_OBJECT(menuItem), "activate", diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index c90cf57996..066c92a17a 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -93,3 +93,11 @@ void wxButton::SetLabel( const wxString &label ) gtk_label_set( g_label, GetLabel() ); } +void wxButton::Enable( bool enable ) +{ + wxControl::Enable( enable ); + GtkButton *bin = GTK_BUTTON( m_widget ); + GtkWidget *label = bin->child; + gtk_widget_set_sensitive( label, enable ); +} + diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 6cd28ae420..39204142f1 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -208,6 +208,12 @@ void wxMenuItem::Check( bool check ) gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); } +void wxMenuItem::Enable( bool enable ) +{ + gtk_widget_set_sensitive( m_menuItem, enable ); + m_isEnabled = enable; +} + bool wxMenuItem::IsChecked() const { wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! @@ -259,6 +265,7 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool const char *text = mitem->GetText(); GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text) : gtk_menu_item_new_with_label(text); + mitem->SetMenuItem(menuItem); gtk_signal_connect( GTK_OBJECT(menuItem), "activate", -- 2.45.2