Mercurial > dwindows

changeset 789:8fe51d916b36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reenabled the set-focus code that was disabled due to combobox issues. Figured out that the replacement for gtk_label_get() is gtk_label_get_text() even though not documented.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 22 Mar 2011 05:07:39 +0000
parents f8f4f72d6462
children 1822c8a71936
files gtk3/dw.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gtk3/dw.c	Tue Mar 22 04:55:47 2011 +0000
+++ b/gtk3/dw.c	Tue Mar 22 05:07:39 2011 +0000
@@ -8498,10 +8498,8 @@
          if(child == pagearray[pageid])
          {
             oldlabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(handle), child);
-#if 0 /* TODO: gtk_label_get is deprecated with no replacement */            
             if(oldlabel)
-               gtk_label_get(GTK_LABEL(oldlabel), &text);
-#endif
+               text = gtk_label_get_text(GTK_LABEL(oldlabel));
             gtk_notebook_remove_page(GTK_NOTEBOOK(handle), z);
             realpage = z;
             break;
@@ -10369,13 +10367,13 @@
       DW_MUTEX_UNLOCK;
       return;
    }
-#if 0
    else if (strcmp(signame, DW_SIGNAL_SET_FOCUS) == 0)
    {
       thisname = "focus-in-event";
       if (GTK_IS_COMBO_BOX(thiswindow))
-         thiswindow = GTK_COMBO_BOX(thiswindow)->entry;
-   }
+         thiswindow = gtk_bin_get_child(GTK_BIN(thiswindow));
+   }
+#if 0
    else if (strcmp(signame, DW_SIGNAL_LOSE_FOCUS) == 0)
    {
       thisname = "focus-out-event";