[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-37-g613dcf8)
The branch, master has been updated
via 613dcf8d3c2cf0ef40278ff481cc44e68c98428a (commit)
via bd101aa36356082f479e1bd4970ea93b01bbfa5d (commit)
via 5e9f49ed25bf87783207906daaf915714f43259c (commit)
via 863d3c63667dc1a106b21758f957d810ee6f5583 (commit)
via bf3a364ed474ce6f5824a5f3fe94a3c17ce8bc28 (commit)
from 615d03958528afabaf94eb95199aa434d5c5d667 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gattrib/src/i_basic.c | 1 -
gschem/src/i_basic.c | 7 ----
gschem/src/o_basic.c | 2 -
gschem/src/o_complex.c | 2 -
gschem/src/x_basic.c | 4 --
gschem/src/x_event.c | 20 ++++-------
gschem/src/x_preview.c | 2 -
gschem/src/x_window.c | 83 ----------------------------------------------
libgeda/include/struct.h | 48 +--------------------------
libgeda/src/s_toplevel.c | 43 ------------------------
10 files changed, 9 insertions(+), 203 deletions(-)
=================
Commit Messages
=================
commit 613dcf8d3c2cf0ef40278ff481cc44e68c98428a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:38:13 2007 +0100
Remove un-necessary variable re-initialisations in x_window_setup().
The initialisations removed are the same as those in s_toplevel_new().
:100644 100644 6fec69f... 674ad00... M gschem/src/x_window.c
commit bd101aa36356082f479e1bd4970ea93b01bbfa5d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:38:02 2007 +0100
Remove the un-needed TOPLEVEL variable: DONT_RECALC, and its usage.
:100644 100644 7c6f638... 3e6b156... M gschem/src/x_basic.c
:100644 100644 89758af... 4833514... M gschem/src/x_event.c
:100644 100644 180097d... 3791d74... M gschem/src/x_preview.c
:100644 100644 3ebaf10... 6fec69f... M gschem/src/x_window.c
:100644 100644 60df345... e250282... M libgeda/include/struct.h
:100644 100644 c3d2f1a... 716cee9... M libgeda/src/s_toplevel.c
commit 5e9f49ed25bf87783207906daaf915714f43259c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:37:56 2007 +0100
Remove the redundant TOPLEVEL variable: DONT_RESIZE
:100644 100644 47c0d20... 3e803ee... M gattrib/src/i_basic.c
:100644 100644 e0e8ab3... 7e2c35c... M gschem/src/i_basic.c
:100644 100644 e63c455... 7c6f638... M gschem/src/x_basic.c
:100644 100644 a2da96a... 180097d... M gschem/src/x_preview.c
:100644 100644 d922d29... 3ebaf10... M gschem/src/x_window.c
:100644 100644 6c52986... 60df345... M libgeda/include/struct.h
:100644 100644 5988f7b... c3d2f1a... M libgeda/src/s_toplevel.c
commit 863d3c63667dc1a106b21758f957d810ee6f5583
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:37:49 2007 +0100
Remove the redundant TOPLEVEL variable: DONT_DRAW_CONN
:100644 100644 6633629... 9a79f93... M gschem/src/o_basic.c
:100644 100644 d2d8233... 7a1a835... M gschem/src/o_complex.c
:100644 100644 2c3c0c2... d922d29... M gschem/src/x_window.c
:100644 100644 2337362... 6c52986... M libgeda/include/struct.h
:100644 100644 708fc9b... 5988f7b... M libgeda/src/s_toplevel.c
commit bf3a364ed474ce6f5824a5f3fe94a3c17ce8bc28
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:37:41 2007 +0100
Remove unused variables from the TOPLEVEL structure
:100644 100644 c78f024... 2c3c0c2... M gschem/src/x_window.c
:100644 100644 ebca2d9... 2337362... M libgeda/include/struct.h
:100644 100644 a7480f7... 708fc9b... M libgeda/src/s_toplevel.c
=========
Changes
=========
commit 613dcf8d3c2cf0ef40278ff481cc44e68c98428a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:38:13 2007 +0100
Remove un-necessary variable re-initialisations in x_window_setup().
The initialisations removed are the same as those in s_toplevel_new().
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 6fec69f..674ad00 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -39,80 +39,7 @@
void x_window_setup (TOPLEVEL *toplevel)
{
/* x_window_setup_rest() - BEGIN */
- toplevel->num_untitled=0;
-
- toplevel->start_x = -1;
- toplevel->start_y = -1;
- toplevel->save_x = -1;
- toplevel->save_y = -1;
- toplevel->last_x = -1;
- toplevel->last_y = -1;
- toplevel->loc_x = -1;
- toplevel->loc_y = -1;
- toplevel->distance = -1;
toplevel->event_state = SELECT;
- toplevel->inside_action = 0;
- toplevel->snap = 1;
- toplevel->grid = 1;
-
- toplevel->show_hidden_text = 0;
-
- toplevel->complex_rotate = 0;
-
- toplevel->current_attribute = NULL;
- toplevel->current_visible = -1; /* not sure on these */
- toplevel->current_show = -1;
-
- toplevel->internal_symbol_name = NULL;
-
- toplevel->series_name = NULL;
- toplevel->untitled_name = NULL;
- toplevel->font_directory = NULL;
- toplevel->scheme_directory = NULL;
- toplevel->bitmap_directory = NULL;
- toplevel->bus_ripper_symname = NULL;
-
- toplevel->override_color = -1;
- toplevel->inside_redraw=0;
-
- toplevel->ADDING_SEL=0;
-
- toplevel->drawbounding_action_mode=FREE;
- toplevel->last_drawb_mode = -1;
- toplevel->CONTROLKEY=0;
- toplevel->SHIFTKEY=0;
- toplevel->last_callback=NULL;
-
- toplevel->major_changed_refdes = NULL;
-
- toplevel->status_label = NULL;
- toplevel->middle_label = NULL;
- toplevel->grid_label = NULL;
-
- toplevel->cswindow = NULL;
- toplevel->sowindow = NULL;
-
- toplevel->tiwindow = NULL;
- toplevel->tewindow = NULL;
- toplevel->aawindow = NULL;
- toplevel->mawindow = NULL;
- toplevel->aewindow = NULL;
- toplevel->trwindow = NULL;
- toplevel->tswindow = NULL;
- toplevel->pswindow = NULL;
- toplevel->iwindow = NULL;
- toplevel->abwindow = NULL;
- toplevel->hkwindow = NULL;
- toplevel->cowindow = NULL;
- toplevel->clwindow = NULL;
- toplevel->sewindow = NULL;
-
- toplevel->coord_world = NULL;
- toplevel->coord_screen = NULL;
- toplevel->doing_pan=FALSE;
- /* toplevel->preview = NULL;experimental widget */
-
- toplevel->buffer_number=0;
/* x_window_setup_rest() - END */
/* immediately setup user params */
commit bd101aa36356082f479e1bd4970ea93b01bbfa5d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:38:02 2007 +0100
Remove the un-needed TOPLEVEL variable: DONT_RECALC, and its usage.
diff --git a/gschem/src/x_basic.c b/gschem/src/x_basic.c
index 7c6f638..3e6b156 100644
--- a/gschem/src/x_basic.c
+++ b/gschem/src/x_basic.c
@@ -188,12 +188,10 @@ void x_scrollbars_update(TOPLEVEL *w_current)
return;
}
- w_current->DONT_RECALC = 1;
w_current->DONT_REDRAW = 1;
x_hscrollbar_update(w_current);
x_vscrollbar_update(w_current);
w_current->DONT_REDRAW = 0;
- w_current->DONT_RECALC = 0;
}
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 89758af..4833514 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -1419,12 +1419,10 @@ void x_event_hschanged (GtkAdjustment *adj, TOPLEVEL *w_current)
current_left = w_current->page_current->left;
new_left = (int) hadjustment->value;
- if (!w_current->DONT_RECALC) {
- w_current->page_current->left = new_left;
- w_current->page_current->right =
- w_current->page_current->right -
- (current_left - new_left);
- }
+ w_current->page_current->left = new_left;
+ w_current->page_current->right =
+ w_current->page_current->right -
+ (current_left - new_left);
if (!w_current->DONT_REDRAW) {
o_redraw_all_fast(w_current);
@@ -1455,12 +1453,10 @@ void x_event_vschanged (GtkAdjustment *adj, TOPLEVEL *w_current)
current_bottom = w_current->page_current->bottom;
new_bottom = w_current->init_bottom - (int) vadjustment->value;
- if (!w_current->DONT_RECALC) {
- w_current->page_current->bottom = new_bottom;
- w_current->page_current->top =
- w_current->page_current->top -
- (current_bottom - new_bottom);
- }
+ w_current->page_current->bottom = new_bottom;
+ w_current->page_current->top =
+ w_current->page_current->top -
+ (current_bottom - new_bottom);
#if DEBUG
printf("vrange %f %f\n", vadjustment->lower, vadjustment->upper);
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index 180097d..3791d74 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -106,7 +106,6 @@ preview_callback_realize (GtkWidget *widget,
x_repaint_background(preview_toplevel);
- preview_toplevel->DONT_RECALC = 0;
preview_toplevel->DONT_REDRAW = 0;
a_zoom_extents(preview_toplevel,
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 3ebaf10..6fec69f 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -121,8 +121,6 @@ void x_window_setup (TOPLEVEL *toplevel)
/* Initialize the autosave callback */
s_page_autosave_init(toplevel);
- toplevel->DONT_RECALC = 0;
-
/* X related stuff */
toplevel->display_height = gdk_screen_height ();
toplevel->display_width = gdk_screen_width ();
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 60df345..e250282 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -466,7 +466,6 @@ struct st_toplevel {
int display_width; /* could me made global (?) */
int DONT_REDRAW; /* misc flags */
- int DONT_RECALC;
int ADDING_SEL;
int drawbounding_action_mode; /* outline vs bounding box */
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index c3d2f1a..716cee9 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -111,7 +111,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->display_width = 0;
toplevel->DONT_REDRAW = 0;
- toplevel->DONT_RECALC = 0;
toplevel->ADDING_SEL = 0;
toplevel->drawbounding_action_mode = FREE;
@@ -379,7 +378,6 @@ TOPLEVEL *s_toplevel_new (void)
/* disable the events */
- toplevel->DONT_RECALC = 1;
toplevel->DONT_REDRAW = 1;
return toplevel;
commit 5e9f49ed25bf87783207906daaf915714f43259c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:37:56 2007 +0100
Remove the redundant TOPLEVEL variable: DONT_RESIZE
diff --git a/gattrib/src/i_basic.c b/gattrib/src/i_basic.c
index 47c0d20..3e803ee 100644
--- a/gattrib/src/i_basic.c
+++ b/gattrib/src/i_basic.c
@@ -55,7 +55,6 @@ static void i_update_status(TOPLEVEL * w_current, const char *string)
if (string) {
/* NOTE: consider optimizing this if same label */
- w_current->DONT_RESIZE = 1;
gtk_label_set(GTK_LABEL(w_current->status_label), (char *) string);
}
}
diff --git a/gschem/src/i_basic.c b/gschem/src/i_basic.c
index e0e8ab3..7e2c35c 100644
--- a/gschem/src/i_basic.c
+++ b/gschem/src/i_basic.c
@@ -48,7 +48,6 @@ static void i_update_status(TOPLEVEL *w_current, const char *string)
if (string) {
/* NOTE: consider optimizing this if same label */
- w_current->DONT_RESIZE=1;
gtk_label_set(GTK_LABEL(w_current->status_label),
(char *) string);
}
@@ -254,30 +253,24 @@ void i_update_middle_button(TOPLEVEL *w_current,
/* remove this case eventually and make it a null case */
case(ACTION):
- w_current->DONT_RESIZE = 1;
gtk_label_set(GTK_LABEL(w_current->middle_label),
_("Action"));
break;
#ifdef HAS_LIBSTROKE
case(STROKE):
- w_current->DONT_RESIZE = 1;
-
gtk_label_set(GTK_LABEL(w_current->middle_label),
_("Stroke"));
break;
#else
/* remove this case eventually and make it a null case */
case(STROKE):
- w_current->DONT_RESIZE = 1;
gtk_label_set(GTK_LABEL(w_current->middle_label),
_("none"));
break;
#endif
case(REPEAT):
- w_current->DONT_RESIZE = 1;
-
temp_string = g_strconcat (_("Repeat/"), string, NULL);
gtk_label_set(GTK_LABEL(w_current->middle_label),
diff --git a/gschem/src/x_basic.c b/gschem/src/x_basic.c
index e63c455..7c6f638 100644
--- a/gschem/src/x_basic.c
+++ b/gschem/src/x_basic.c
@@ -189,13 +189,11 @@ void x_scrollbars_update(TOPLEVEL *w_current)
}
w_current->DONT_RECALC = 1;
- w_current->DONT_RESIZE = 1;
w_current->DONT_REDRAW = 1;
x_hscrollbar_update(w_current);
x_vscrollbar_update(w_current);
w_current->DONT_REDRAW = 0;
w_current->DONT_RECALC = 0;
- w_current->DONT_RESIZE = 0;
}
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index a2da96a..180097d 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -107,7 +107,6 @@ preview_callback_realize (GtkWidget *widget,
x_repaint_background(preview_toplevel);
preview_toplevel->DONT_RECALC = 0;
- preview_toplevel->DONT_RESIZE = 0;
preview_toplevel->DONT_REDRAW = 0;
a_zoom_extents(preview_toplevel,
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index d922d29..3ebaf10 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -121,7 +121,6 @@ void x_window_setup (TOPLEVEL *toplevel)
/* Initialize the autosave callback */
s_page_autosave_init(toplevel);
- toplevel->DONT_RESIZE = 0;
toplevel->DONT_RECALC = 0;
/* X related stuff */
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 6c52986..60df345 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -465,8 +465,7 @@ struct st_toplevel {
int display_height; /* display params */
int display_width; /* could me made global (?) */
- int DONT_RESIZE; /* misc flags */
- int DONT_REDRAW;
+ int DONT_REDRAW; /* misc flags */
int DONT_RECALC;
int ADDING_SEL;
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 5988f7b..c3d2f1a 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -110,7 +110,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->display_height = 0;
toplevel->display_width = 0;
- toplevel->DONT_RESIZE = 0;
toplevel->DONT_REDRAW = 0;
toplevel->DONT_RECALC = 0;
toplevel->ADDING_SEL = 0;
@@ -380,7 +379,6 @@ TOPLEVEL *s_toplevel_new (void)
/* disable the events */
- toplevel->DONT_RESIZE = 1;
toplevel->DONT_RECALC = 1;
toplevel->DONT_REDRAW = 1;
commit 863d3c63667dc1a106b21758f957d810ee6f5583
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:37:49 2007 +0100
Remove the redundant TOPLEVEL variable: DONT_DRAW_CONN
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 6633629..9a79f93 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -233,7 +233,6 @@ void o_erase_single(TOPLEVEL *w_current, OBJECT *object)
o_current = object;
- w_current->DONT_DRAW_CONN = 1;
w_current->override_color = w_current->background_color;
if (o_current != NULL) {
if (o_current->draw_func &&
@@ -242,7 +241,6 @@ void o_erase_single(TOPLEVEL *w_current, OBJECT *object)
}
}
w_current->override_color = -1;
- w_current->DONT_DRAW_CONN = 0;
}
/*! \todo Finish function documentation!!!
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index d2d8233..7a1a835 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -144,7 +144,6 @@ void o_complex_start(TOPLEVEL *w_current, int screen_x, int screen_y)
&x,
&y);
- w_current->DONT_DRAW_CONN = 1;
w_current->ADDING_SEL = 1; /* reuse this flag, rename later hack */
sym = s_clib_get_symbol_by_name (w_current->internal_symbol_name);
o_complex_add(w_current, NULL,
@@ -153,7 +152,6 @@ void o_complex_start(TOPLEVEL *w_current, int screen_x, int screen_y)
sym, w_current->internal_symbol_name,
1, TRUE);
w_current->ADDING_SEL = 0;
- w_current->DONT_DRAW_CONN = 0;
if (w_current->complex_rotate) {
temp = w_current->complex_rotate / 90;
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 2c3c0c2..d922d29 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -121,7 +121,6 @@ void x_window_setup (TOPLEVEL *toplevel)
/* Initialize the autosave callback */
s_page_autosave_init(toplevel);
- toplevel->DONT_DRAW_CONN = 0;
toplevel->DONT_RESIZE = 0;
toplevel->DONT_RECALC = 0;
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 2337362..6c52986 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -465,8 +465,7 @@ struct st_toplevel {
int display_height; /* display params */
int display_width; /* could me made global (?) */
- int DONT_DRAW_CONN; /* misc flags */
- int DONT_RESIZE;
+ int DONT_RESIZE; /* misc flags */
int DONT_REDRAW;
int DONT_RECALC;
int ADDING_SEL;
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 708fc9b..5988f7b 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -110,7 +110,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->display_height = 0;
toplevel->display_width = 0;
- toplevel->DONT_DRAW_CONN = 0;
toplevel->DONT_RESIZE = 0;
toplevel->DONT_REDRAW = 0;
toplevel->DONT_RECALC = 0;
@@ -381,7 +380,6 @@ TOPLEVEL *s_toplevel_new (void)
/* disable the events */
- toplevel->DONT_DRAW_CONN = 1;
toplevel->DONT_RESIZE = 1;
toplevel->DONT_RECALC = 1;
toplevel->DONT_REDRAW = 1;
commit bf3a364ed474ce6f5824a5f3fe94a3c17ce8bc28
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 5 14:37:41 2007 +0100
Remove unused variables from the TOPLEVEL structure
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index c78f024..2c3c0c2 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -75,7 +75,6 @@ void x_window_setup (TOPLEVEL *toplevel)
toplevel->override_color = -1;
toplevel->inside_redraw=0;
- toplevel->FORCE_CONN_UPDATE=0;
toplevel->ADDING_SEL=0;
toplevel->drawbounding_action_mode=FREE;
@@ -124,7 +123,6 @@ void x_window_setup (TOPLEVEL *toplevel)
toplevel->DONT_DRAW_CONN = 0;
toplevel->DONT_RESIZE = 0;
- toplevel->DONT_EXPOSE = 0;
toplevel->DONT_RECALC = 0;
/* X related stuff */
@@ -135,14 +133,10 @@ void x_window_setup (TOPLEVEL *toplevel)
toplevel->init_left = -45;
toplevel->init_top = -45;
/* init_right and _bottom are set before this function is called */
- toplevel->min_zoom = 0;
- toplevel->max_zoom = 256; /* was 128 */
toplevel->width = default_width;
toplevel->height = default_height;
- toplevel->starting_width = toplevel->width;
-
toplevel->win_width = toplevel->width;
toplevel->win_height = toplevel->height;
/* x_window_setup_world() - END */
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index ebca2d9..2337362 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -456,33 +456,19 @@ struct st_toplevel {
int image_width, image_height; /* h, w of image write */
int snap; /* Snap on/off*/
int grid; /* Grid on/off*/
- int min_zoom; /* minimum zoom factor */
- int max_zoom; /* maximum zoom factor */
-
- /* starting window width used to control text */
- int starting_width;
/* location to hold current alignment of text */
int text_alignment;
- /* location to hold current line type selection */
- int line_type;
-
- /* location to hold current fill type selection (PB) */
- int fill_type;
-
int override_color; /* used in doing selections */
int inside_redraw; /* complex vs list redrawing */
- double window_aspectratio; /* Window ratio (?) */
int display_height; /* display params */
int display_width; /* could me made global (?) */
int DONT_DRAW_CONN; /* misc flags */
int DONT_RESIZE;
- int DONT_EXPOSE;
int DONT_REDRAW;
int DONT_RECALC;
- int FORCE_CONN_UPDATE;
int ADDING_SEL;
int drawbounding_action_mode; /* outline vs bounding box */
@@ -509,7 +495,6 @@ struct st_toplevel {
int complex_rotate;
void (*last_callback)(); /* Last i_call* cmd executed */
- char *cwd; /* current working directory */
GList* major_changed_refdes; /* A list of all refdes's that have */
/* major symbol version changes */
@@ -526,60 +511,35 @@ struct st_toplevel {
GtkWidget *left_label;
GtkWidget *middle_label;
GtkWidget *right_label;
- GtkWidget *filename_label;
GtkWidget *grid_label;
GtkWidget *status_label;
GtkWidget *toolbar_select;
GtkWidget *toolbar_net;
GtkWidget *toolbar_bus;
- GtkWidget *toolbar_edit;
- GtkWidget *toolbar_move;
- GtkWidget *toolbar_copy;
- GtkWidget *toolbar_delete;
- GtkWidget *toolbar_rotate;
- GtkWidget *toolbar_mirror;
/* Dialog boxes */
GtkWidget *sowindow; /* Script open */
GtkWidget *pfswindow; /* Picture File Selection window */
- GtkWidget *pcfswindow; /* Picture Change File Selection window */
- int saveas_flag; /* what action after save? */
-
- GtkWidget *attr_list;
- GtkWidget *asentry_name;
- GtkWidget *asentry_value;
GtkWidget *cswindow; /* component select */
- GtkWidget *clib_list;
- GtkWidget *basename_list;
GtkWidget *iwindow; /* image write dialog box */
- GtkWidget *ifilename_entry;
GtkWidget *pswindow; /* page select */
/* misc dialogs */
GtkWidget *tiwindow; /* text input */
GtkWidget *tewindow; /* text edit */
- GtkWidget *teentry;
GtkWidget *sewindow; /* slot edit */
- GtkWidget *seentry;
GtkWidget *aawindow; /* arc attribs */
GtkWidget *mawindow; /* multi attribute */
GtkWidget *aewindow; /* attribute edit */
- GtkWidget *aaentry_start;
- GtkWidget *aaentry_sweep;
GtkWidget *trwindow; /* translate */
- GtkWidget *trentry;
GtkWidget *tswindow; /* text size */
GtkWidget *tshowwindow; /* text show window */
GtkWidget *thidewindow; /* text hide window */
GtkWidget *tfindwindow; /* text find window */
- GtkWidget *tsentry; /* used in edit/edit and */
- /* Text size and the snap */
- /* size dialog boxes */
-
GtkWidget *abwindow; /* Help/About... dialog*/
GtkWidget *hkwindow; /* Help/Hotkeys... dialog*/
GtkWidget *cowindow;
@@ -781,9 +741,6 @@ struct st_toplevel {
/* BUTT, ROUND, SQUARE caps */
int print_output_capstyle;
- /* either window or limits */
- int image_output_type;
-
/* landscape printing only */
int paper_width, paper_height;
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index a7480f7..708fc9b 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -102,29 +102,18 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->image_height = 0;
toplevel->snap = 1;
toplevel->grid = 1;
- toplevel->min_zoom = 0;
- toplevel->max_zoom = 8;
-
- toplevel->starting_width = 0;
toplevel->text_alignment = 0;
- toplevel->line_type = 0;
-
- toplevel->fill_type = 0;
-
toplevel->override_color = -1;
toplevel->inside_redraw = 0;
- toplevel->window_aspectratio = 0;
toplevel->display_height = 0;
toplevel->display_width = 0;
toplevel->DONT_DRAW_CONN = 0;
toplevel->DONT_RESIZE = 0;
- toplevel->DONT_EXPOSE = 0;
toplevel->DONT_REDRAW = 0;
toplevel->DONT_RECALC = 0;
- toplevel->FORCE_CONN_UPDATE = 0;
toplevel->ADDING_SEL = 0;
toplevel->drawbounding_action_mode = FREE;
@@ -146,7 +135,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->complex_rotate = 0;
toplevel->last_callback = NULL;
- toplevel->cwd = NULL;
toplevel->major_changed_refdes = NULL;
@@ -161,55 +149,34 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->left_label = NULL;
toplevel->middle_label = NULL;
toplevel->right_label = NULL;
- toplevel->filename_label = NULL;
toplevel->grid_label = NULL;
toplevel->status_label = NULL;
toplevel->toolbar_select = NULL;
toplevel->toolbar_net = NULL;
toplevel->toolbar_bus = NULL;
- toplevel->toolbar_edit = NULL;
- toplevel->toolbar_move = NULL;
- toplevel->toolbar_copy = NULL;
- toplevel->toolbar_delete = NULL;
- toplevel->toolbar_rotate = NULL;
- toplevel->toolbar_mirror = NULL;
toplevel->sowindow = NULL;
- toplevel->saveas_flag = 0;
-
- toplevel->attr_list = NULL;
- toplevel->asentry_name = NULL;
- toplevel->asentry_value = NULL;
toplevel->cswindow = NULL;
- toplevel->clib_list = NULL;
- toplevel->basename_list = NULL;
/* toplevel->fileselect */
toplevel->iwindow = NULL;
- toplevel->ifilename_entry = NULL;
toplevel->pswindow = NULL;
toplevel->tiwindow = NULL;
toplevel->tewindow = NULL;
- toplevel->teentry = NULL;
toplevel->sewindow = NULL;
- toplevel->seentry = NULL;
toplevel->aawindow = NULL;
toplevel->mawindow = NULL;
toplevel->aewindow = NULL;
- toplevel->aaentry_start = NULL;
- toplevel->aaentry_sweep = NULL;
toplevel->trwindow = NULL;
- toplevel->trentry = NULL;
toplevel->tswindow = NULL;
toplevel->tshowwindow = NULL;
toplevel->thidewindow = NULL;
toplevel->tfindwindow = NULL;
- toplevel->tsentry = NULL;
toplevel->abwindow = NULL;
toplevel->hkwindow = NULL;
@@ -218,7 +185,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->coord_screen = NULL;
toplevel->pfswindow = NULL;
- toplevel->pcfswindow = NULL;
toplevel->current_pixbuf = NULL;
toplevel->pixbuf_filename = NULL;
@@ -359,8 +325,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->print_output_capstyle = BUTT_CAP;
- toplevel->image_output_type = 0;
-
toplevel->paper_width = 0;
toplevel->paper_height = 0;
@@ -419,7 +383,6 @@ TOPLEVEL *s_toplevel_new (void)
/* disable the events */
toplevel->DONT_DRAW_CONN = 1;
toplevel->DONT_RESIZE = 1;
- toplevel->DONT_EXPOSE = 1;
toplevel->DONT_RECALC = 1;
toplevel->DONT_REDRAW = 1;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs