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

diff --git a/TODO.txt b/TODO.txt
index fe11d23cd6b28213f77699eccbe11a087fa5c82d..5c5874812c6c4cfb24e8845113c82a6bf96af2b2 100644 (file)
--- 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
 Implement wxDirDialog
 Implement CopyOnWrite (unshare) for GDI objects
 Support cooperation between Qt and wxWindows

+Fix toolbar tips

 TrueType support (just kidding)
 
 TrueType support (just kidding)
 

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 8022f9c41991fc41396b305547a1f02f5fec272b..d83a8d59ea7062412928eacd8ab79ee40b1b731c 100644 (file)
--- 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 );
            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 );
 };
     void SetFont( const wxFont &font );
     void Enable( bool enable );
 };

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 8022f9c41991fc41396b305547a1f02f5fec272b..d83a8d59ea7062412928eacd8ab79ee40b1b731c 100644 (file)
--- 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 );
            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 );
 };
     void SetFont( const wxFont &font );
     void Enable( bool enable );
 };

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index d710aa4fcf49eca330049c202df53c87ddb54468..e50abc4759332a21f54c892fa52ceb7ab622120f 100644 (file)
--- 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 );
 }
 
     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;
 }
 
 {
   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 );
 void wxCheckBox::Enable( bool enable )
 {
   wxControl::Enable( enable );

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 1ced090e504559129fc012faf26a49b27173aace..57bd59292ebfd74daad9eb3ca7993587c618aa32 100644 (file)
--- 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 );
   
   
   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;
 
   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 );
 
   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 d710aa4fcf49eca330049c202df53c87ddb54468..e50abc4759332a21f54c892fa52ceb7ab622120f 100644 (file)
--- 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 );
 }
 
     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;
 }
 
 {
   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 );
 void wxCheckBox::Enable( bool enable )
 {
   wxControl::Enable( enable );

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 1ced090e504559129fc012faf26a49b27173aace..57bd59292ebfd74daad9eb3ca7993587c618aa32 100644 (file)
--- 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 );
   
   
   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;
 
   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 );
 
   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 edfc2aaa4e52c2c70f616e3579f0b89f2e09eafe..e086dd23779046da0bfb0f821b6785ca5700526b 100644 (file)
--- 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_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
 END_EVENT_TABLE()
 
 class wxPropertyStringListEditorText: public wxTextCtrl