--- a/glibre.c Sat Jun 05 15:21:03 2010 -0500
+++ b/glibre.c Tue Jun 08 19:07:12 2010 -0500
@@ -30,7 +30,6 @@
- GtkWidget *regex_expander;
@@ -81,16 +80,6 @@
/******************************************************************************
*****************************************************************************/
-#define GLIBRE_EXPANDER_GROUP "expanders"
-#define GLIBRE_EXPANDER_REGEX "regex"
-#define GLIBRE_EXPANDER_METHOD "method"
-#define GLIBRE_EXPANDER_COMPILE "compile options"
-#define GLIBRE_EXPANDER_MATCH "match"
-#define GLIBRE_EXPANDER_REPLACE "replace"
-#define GLIBRE_EXPANDER_DATA "data"
-#define GLIBRE_EXPANDER_GROUPS "groups"
-#define GLIBRE_EXPANDER_RESULTS "results"
#define GLIBRE_ENTRIES_GROUP "inputs"
#define GLIBRE_REGEX "regex"
#define GLIBRE_METHOD "method"
@@ -183,11 +172,6 @@
conf_file = glibre_config_file("glibre.conf");
- #define glibre_load_expander(group, key, widget) { \
- gboolean toggle = g_key_file_get_boolean(key_file, (group), (key), NULL); \
- gtk_expander_set_expanded(GTK_EXPANDER((widget)), toggle); \
#define glibre_load_entry(group, key, widget) { \
gchar *string = g_key_file_get_string(key_file, (group), (key), NULL); \
glibre_set_entry_text(widget, string); \
@@ -299,10 +283,6 @@
- #define glibre_save_expander(group, key, value) \
- g_key_file_set_boolean(key_file, (group), (key), \
- gtk_expander_get_expanded(GTK_EXPANDER(value)))
#define glibre_save_entry(group, key, value) \
g_key_file_set_string(key_file, (group), (key), \
glibre_get_entry_text((value)))
@@ -750,15 +730,13 @@
gtk_container_add(GTK_CONTAINER(sw), window.regex_entry);
/**************************************************************************
- * build the method expander and it's children
+ * build the method dock and it's children **************************************************************************/
window.method_dock = gdl_dock_item_new("method", "Method",
GDL_DOCK_ITEM_BEH_NORMAL);
gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.method_dock),
- //gtk_box_pack_start(GTK_BOX(vbox), window.method_expander, FALSE, FALSE, 0);
table = gtk_table_new(1, 3, TRUE);
gtk_container_add(GTK_CONTAINER(window.method_dock), table);
@@ -782,7 +760,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), window.method_split, 2, 3, 0, 1);
/**************************************************************************
- * build the compile option expander and it's children
+ * build the compile option dock and it's children **************************************************************************/
window.compile_dock = gdl_dock_item_new("compile-flags", "Compile Options",
GDL_DOCK_ITEM_BEH_NORMAL);