From 95cd67ef6c80afe4ab7c30e7aa3773f1628ee1de Mon Sep 17 00:00:00 2001 From: yangxx Date: Wed, 27 Aug 2003 15:46:28 +0000 Subject: [PATCH] git-svn-id: http://ltt.polymtl.ca/svn@207 04897980-b3bd-0310-b5e0-8ef037075253 --- .../lttv/modules/gui/mainWin/src/callbacks.c | 2 +- .../lttv/modules/gui/mainWin/src/gtkcustom.c | 2 +- .../lttv/modules/gui/mainWin/src/gtkcustom.h | 66 ---------------- .../modules/gui/mainWin/src/init_module.c | 2 +- .../poly/lttv/modules/gui/mainWin/src/main.c | 2 +- .../lttv/modules/gui/mainWin/src/mainWindow.h | 76 ------------------- 6 files changed, 4 insertions(+), 146 deletions(-) delete mode 100644 ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.h delete mode 100644 ltt/branches/poly/lttv/modules/gui/mainWin/src/mainWindow.h 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 7df9aa13..d0f75471 100644 --- 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 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 b0fb2ec3..52249288 100644 --- 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 -#include "gtkcustom.h" +#include //#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 index 2bd174bb..00000000 --- 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 -#include -#include -#include - - -#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 cccd1d6b..1aa9c19d 100644 --- 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 #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 2df8b030..46044437 100644 --- 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 #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 index b43ac367..00000000 --- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/mainWindow.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef _MAIN_WINDOW_ -#define _MAIN_WINDOW_ - -#include - -#include -#include -#include -#include - -#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_ */ - - -- 2.34.1