Cleaning up widget code and using a naming convention for such files.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15232 85f007b7-540e-0410-9357-904b9bb8a0f7

6 files changed, 43 insertions, 5 deletions

diff --git a/ide/coqide.ml b/ide/coqide.ml
index 263ccf7a6..9540fe4b9 100644
--- a/ide/coqide.ml
+++ b/ide/coqide.ml
@@ -102,7 +102,7 @@ type viewable_script =
      message_view : GText.view;
      analyzed_view : analyzed_views;
      toplvl : Coq.coqtop ref;
-     command : Command_windows.command_window;
+     command : Wg_Command.command_window;
     }
 
 let kill_session s =
@@ -159,7 +159,7 @@ let build_session s =
   (Some session_tab#coerce,None,session_paned#coerce)
 
 let session_notebook =
-  Typed_notebook.create build_session kill_session
+  Wg_Notebook.create build_session kill_session
     ~border_width:2 ~show_border:false ~scrollable:true ()
 
 let cb = GData.clipboard Gdk.Atom.primary
@@ -1512,7 +1512,7 @@ let create_session file =
 	|Subst_args -> Project_file.args_from_project the_file !custom_project_files !current.project_file_name
   in
   let ct = ref (Coq.spawn_coqtop coqtop_args) in
-  let command = new Command_windows.command_window ct current in
+  let command = new Wg_Command.command_window ct current in
   let legacy_av = new analyzed_view script proof message stack ct file in
   let () = legacy_av#update_stats in
   let _ =
diff --git a/ide/ide.mllib b/ide/ide.mllib
index 9bbf9b0d9..ee498ba0c 100644
--- a/ide/ide.mllib
+++ b/ide/ide.mllib
@@ -9,7 +9,7 @@ Configwin
 Editable_cells
 Config_parser
 Tags
-Typed_notebook
+Wg_Notebook
 Config_lexer
 Utf8_convert
 Preferences
@@ -21,6 +21,6 @@ Gtk_parsing
 Undo
 Coq
 Coq_commands
-Command_windows
+Wg_Command
 Coqide_ui
 Coqide
diff --git a/ide/command_windows.ml b/ide/wg_Command.ml
index a34e5ebeb..a34e5ebeb 100644
--- a/ide/command_windows.ml
+++ b/ide/wg_Command.ml
diff --git a/ide/command_windows.mli b/ide/wg_Command.mli
index c34b6cf67..c34b6cf67 100644
--- a/ide/command_windows.mli
+++ b/ide/wg_Command.mli
diff --git a/ide/typed_notebook.ml b/ide/wg_Notebook.ml
index 499d56bd9..499d56bd9 100644
--- a/ide/typed_notebook.ml
+++ b/ide/wg_Notebook.ml
diff --git a/ide/wg_Notebook.mli b/ide/wg_Notebook.mli
new file mode 100644
index 000000000..d413a4b02
--- /dev/null
+++ b/ide/wg_Notebook.mli
@@ -0,0 +1,38 @@
+(************************************************************************)
+(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(*   \VV/  **************************************************************)
+(*    //   *      This file is distributed under the terms of the       *)
+(*         *       GNU Lesser General Public License Version 2.1        *)
+(************************************************************************)
+
+class ['a] typed_notebook :
+  ('a -> GObj.widget option * GObj.widget option * GObj.widget) ->
+  ('a -> unit) ->
+  Gtk.notebook Gtk.obj ->
+object
+  inherit GPack.notebook
+  method append_term : 'a -> int
+  method prepend_term : 'a -> int
+  method set_term : 'a -> unit
+  method get_nth_term : int -> 'a
+  method term_num : 'a -> int
+  method pages : 'a list
+  method remove_page : int -> unit
+  method current_term : 'a
+end
+
+val create :
+  ('a -> GObj.widget option * GObj.widget option * GObj.widget) ->
+  ('a -> unit) ->
+  ?enable_popup:bool ->
+  ?homogeneous_tabs:bool ->
+  ?scrollable:bool ->
+  ?show_border:bool ->
+  ?show_tabs:bool ->
+  ?tab_border:int ->
+  ?tab_pos:Gtk.Tags.position ->
+  ?border_width:int ->
+  ?width:int ->
+  ?height:int ->
+  ?packing:(GObj.widget -> unit) -> ?show:bool -> unit -> 'a typed_notebook