Added graying out of menus and buttons

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 5adbd99d0c5efd073a72654cf3a166f579b6bb1b..0d5bf16b5cc6fda265f1350b928142ef4e1249c1 100644 (file)
--- 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 6e5232dd50b9db5e6dbe806142529d9f772d72ca..f3802598be8cafc238915b59d54f16e6aaab1dfe 100644 (file)
--- 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 5adbd99d0c5efd073a72654cf3a166f579b6bb1b..0d5bf16b5cc6fda265f1350b928142ef4e1249c1 100644 (file)
--- 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 6e5232dd50b9db5e6dbe806142529d9f772d72ca..f3802598be8cafc238915b59d54f16e6aaab1dfe 100644 (file)
--- 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 c90cf57996b4d093f5c6be3dab7ca27c348c6db7..066c92a17a5c826ec16c36254107dac71b4af92a 100644 (file)
--- 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 6cd28ae420d18a3f47be58d9015f0fba8ccb392b..39204142f1e4910a7278ae0d1c658c8d7a983363 100644 (file)
--- 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 c90cf57996b4d093f5c6be3dab7ca27c348c6db7..066c92a17a5c826ec16c36254107dac71b4af92a 100644 (file)
--- 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 6cd28ae420d18a3f47be58d9015f0fba8ccb392b..39204142f1e4910a7278ae0d1c658c8d7a983363 100644 (file)
--- 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",