[gq-commit] gq/src browse-dnd.h,1.4,1.5 browse.h,1.31,1.32 common.h,1.27,1.28 mainwin.h,1.20,1.21 schemabrowse.h,1.11,1.12 search.h,1.12,1.13

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22151

Modified Files:
	browse-dnd.h browse.h common.h mainwin.h schemabrowse.h 
	search.h 
Log Message:
* Further cleanups - move the struct tab from common.h to mainwin.h (after
  all: tabs belong to the main window and nowhere else)


Index: browse-dnd.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse-dnd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** browse-dnd.h	29 Sep 2003 19:24:15 -0000	1.4
--- browse-dnd.h	17 Oct 2003 05:47:49 -0000	1.5
***************
*** 33,36 ****
--- 33,38 ----
  #include "common.h"
  
+ #include "mainwin.h"  /* struct tab */
+ 
  /* Flags used in new_dnd_refresh on top of the options for
     refresh_subtree_with_options. Thus these option values share the

Index: browse.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** browse.h	13 Oct 2003 07:38:41 -0000	1.31
--- browse.h	17 Oct 2003 05:47:49 -0000	1.32
***************
*** 29,32 ****
--- 29,33 ----
  
  #include "common.h"
+ #include "mainwin.h"   /* struct tab */
  
  #define BROWSETAB(tab) (assert(tab->type == BROWSE_MODE), ((struct tab_browse *)tab->modeinfo))

Index: common.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/common.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** common.h	11 Oct 2003 21:47:51 -0000	1.27
--- common.h	17 Oct 2003 05:47:49 -0000	1.28
***************
*** 64,93 ****
  };
  
- #define SEARCH_MODE       1
- #define BROWSE_MODE       2
- #define SCHEMA_MODE       3
- 
- /* fwd decl */
- struct mainwin_data;
- 
- struct tab;
- 
- struct tab_vtab {
-      void (*save_snapshot)(char *state_name, struct tab *);
-      void (*restore_snapshot)(char *state_name, struct tab *);
- };
- 
- struct tab {
-      int type;
-      struct mainwin_data *win;		/* what window does this tab
- 					   belong to */
-      GtkWidget *focus;
-      GtkWidget *content;		/* what is the "content"
- 					   widget of the tab */
-      void *modeinfo;
- 
-      struct tab_vtab *vtab;
- };
- 
  
  #define SERVER_HAS_NO_SCHEMA     1
--- 64,67 ----

Index: mainwin.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mainwin.h	11 Oct 2003 21:35:29 -0000	1.20
--- mainwin.h	17 Oct 2003 05:47:49 -0000	1.21
***************
*** 48,51 ****
--- 48,76 ----
  };
  
+ #define SEARCH_MODE       1
+ #define BROWSE_MODE       2
+ #define SCHEMA_MODE       3
+ 
+ struct tab;
+ struct pbar_win;
+ 
+ struct tab_vtab {
+      void (*save_snapshot)(char *state_name, struct tab *);
+      void (*restore_snapshot)(char *state_name, struct tab *, 
+ 			      struct pbar_win *progress);
+ };
+ 
+ struct tab {
+      int type;
+      struct mainwin_data *win;		/* what window does this tab
+ 					   belong to */
+      GtkWidget *focus;
+      GtkWidget *content;		/* what is the "content"
+ 					   widget of the tab */
+      void *modeinfo;
+ 
+      struct tab_vtab *vtab;
+ };
+ 
  extern struct mainwin_data mainwin;
  
***************
*** 56,70 ****
  void fill_serverlist_combo(GtkWidget *combo);
  void cleanup(struct mainwin_data *win);
- void gq_exit(GtkWidget *widget, struct mainwin_data *win);
  void create_mainwin(struct mainwin_data *);
  struct tab *new_modetab(struct mainwin_data *, int mode);
- void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
- 			int pagenum, struct mainwin_data *win);
  void cleanup_all_tabs(struct mainwin_data *win);
- void close_current_tab(struct mainwin_data *win);
  void cleanup_tab(struct tab *tab);
  void update_serverlist(struct mainwin_data *win);
  void create_license_window(void);
- /* void close_license_window(GtkWidget *widget); */
  GtkWidget *create_about_window(void);
  /* gboolean ctrl_b_hack(GtkWidget *widget, GdkEventKey *event, gpointer obj); */
--- 81,90 ----

Index: schemabrowse.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** schemabrowse.h	11 Oct 2003 21:35:30 -0000	1.11
--- schemabrowse.h	17 Oct 2003 05:47:49 -0000	1.12
***************
*** 31,34 ****
--- 31,35 ----
  
  #include "common.h"
+ #include "mainwin.h"  /* struct tab */
  
  #define SCHEMATAB(tab) (assert(tab->type == SCHEMA_MODE), (struct tab_schema *)tab->modeinfo)

Index: search.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** search.h	11 Oct 2003 22:37:09 -0000	1.12
--- search.h	17 Oct 2003 05:47:49 -0000	1.13
***************
*** 28,31 ****
--- 28,32 ----
  
  #include "common.h"
+ #include "mainwin.h"
  
  #define SEARCHTAB(tab) (assert(tab->type == SEARCH_MODE), (struct tab_search *)tab->modeinfo)