git-svn-id: http://ltt.polymtl.ca/svn@207 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
index 7df9aa1378769735bdea5880b93cb12563c26b78..d0f75471665ef8e152d400cd428e97b99c9fd1fd 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -8,7 +8,7 @@
 #include "callbacks.h"
 #include "interface.h"
 #include "support.h"
-#include "mainWindow.h"
+#include <lttv/mainWindow.h>
 
 
 extern systemView * gSysView;

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c
index b0fb2ec3d31983ab26717663e3e04d9ff6101832..52249288fb3dddcd8f1584f5e6d17a4221a1d177 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "gtkcustom.h"
+#include <lttv/gtkcustom.h>
 //#include "gtkintl.h"
 
 static void gtk_custom_class_init (GtkCustomClass    *klass);

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.h b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.h
deleted file mode 100644 (file)
index 2bd174b..0000000
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-#ifndef __GTK_CUSTOM_H__
-#define __GTK_CUSTOM_H__
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GTK_TYPE_CUSTOM            (gtk_custom_get_type ())
-#define GTK_CUSTOM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CUSTOM, GtkCustom))
-#define GTK_CUSTOM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CUSTOM, GtkCustomClass))
-#define GTK_IS_CUSTOM(obj   )      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CUSTOM))
-#define GTK_IS_CUSTOM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CUSTOM))
-#define GTK_CUSTOM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CUSTOM, GtkCustomClass))
-
-
-typedef struct _GtkCustom       GtkCustom;
-typedef struct _GtkCustomClass   GtkCustomClass;
-
-struct _GtkCustom
-{
-  GtkPaned container;
-
-  /*< public >*/
-  GtkPaned * firstPane;
-  GtkPaned * lastPane;
-  GtkPaned * focusedPane;
-  guint numChildren;
-
-  GtkWidget * vbox;
-  //  GtkWidget * scrollWindow;
-  //  GtkWidget * viewport;
-  GtkWidget * hScrollbar;  
-};
-
-struct _GtkCustomClass
-{
-  GtkPanedClass parent_class;
-};
-
-
-GType     gtk_custom_get_type         (void) G_GNUC_CONST;
-GtkWidget* gtk_custom_new (void);
-
-void gtk_custom_set_focus (GtkWidget * widget, gpointer user_data);     
-void gtk_custom_widget_add(GtkCustom * custom, GtkWidget * widget1);
-void gtk_custom_widget_delete(GtkCustom * custom);
-void gtk_custom_widget_move_up(GtkCustom * custom);
-void gtk_custom_widget_move_down(GtkCustom * custom);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_CUSTOM_H__ */

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c
index cccd1d6b36637f15c41aa34ffa17c12717a6ac4b..1aa9c19df9784aa6348a8abfc3944e80b9c668e0 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c
@@ -18,7 +18,7 @@
 
 #include "interface.h"
 #include "support.h"
-#include "mainWindow.h"
+#include <lttv/mainWindow.h>
 #include "callbacks.h"
 
 /* global variable */

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/main.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/main.c
index 2df8b0300af464bf3b90db5ac57db1ec27edea4b..46044437030b77274f07395afecff3f89c2e2ae9 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/main.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/main.c
@@ -12,7 +12,7 @@
 
 #include "interface.h"
 #include "support.h"
-#include "mainWindow.h"
+#include <lttv/mainWindow.h>
 #include "callbacks.h"
 
 /* global variable */

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/mainWindow.h b/ltt/branches/poly/lttv/modules/gui/mainWin/src/mainWindow.h
deleted file mode 100644 (file)
index b43ac36..0000000
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/mainWindow.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _MAIN_WINDOW_
-#define _MAIN_WINDOW_
-
-#include <gtk/gtk.h>
-
-#include <ltt/ltt.h>
-#include <lttv/attribute.h>
-#include <lttv/traceset.h>
-#include <lttv/processTrace.h>
-
-#include "gtkcustom.h"
-
-typedef struct _TimeInterval{
-  LttTime startTime;
-  LttTime endTime;  
-} TimeInterval;
-
-
-typedef struct _systemView systemView;
-typedef struct _tab tab;
-
-typedef struct _mainWindow{
-  GtkWidget*      MWindow;            /* Main Window */
-  systemView *    SystemView;         /* System view displayed in this window*/
-
-  /* Status bar information */
-  //  guint         MainSBarContextID;    /* Context ID of main status bar */
-  //  guint         BegTimeSBarContextID; /* Context ID of BegTime status bar */
-  //  guint         EndTimeSBarContextID; /* Context ID of EndTime status bar */
-  
-  /* Child windows */
-  //openTracesetWindow*  OpenTracesetWindow;/* Window to get prof and proc file*/
-  //viewTimeFrameWindow* ViewTimeFrameWindow;/*Window to select time frame */
-  //gotoEventWindow*     GotoEventWindow; /*search for event description*/
-  //openFilterWindow*    OpenFilterWindow; /* Open a filter selection window */
-  GtkWidget*           HelpContents;/* Window to display help contents */
-  GtkWidget*           AboutBox;    /* Window  about information */
- 
-  LttvTracesetContext * traceset_context; 
-  LttvTraceset * traceset;  /* trace set associated with the window */
-  //  lttv_trace_filter * filter; /* trace filter associated with the window */
-  
-
-  tab * Tab;
-  tab * CurrentTab;
-  LttvIAttribute * Attributes;
- 
-} mainWindow;
-
-typedef GtkWidget * (*view_constructor)(mainWindow * main_win);
-
-struct _systemView{
-  gpointer             EventDB;
-  gpointer           * SystemInfo;
-  gpointer           * Options;
-  mainWindow         * Window;
-  struct _systemView * Next;
-};
-
-struct _tab{
-  GtkWidget * label;
-  GtkCustom * custom;
-
-  LttTime traceStartTime;
-  LttTime traceEndTime;
-  LttTime startTime;
-  LttTime endTime;
-  LttTime currentTime;
-  LttvIAttribute * Attributes;
-
-  struct _tab * Next;
-};
-
-#endif /* _MAIN_WINDOW_ */
-
-