Menu
▾
▴
[htoolkit-cvs] port/src/cbits/GTK Frame.c,1.8,1.9 Menu.c,1.7,1.8 Window.c,1.17,1.18
|
From: <kr_...@us...> - 2003-07-05 06:42:41
|
Update of /cvsroot/htoolkit/port/src/cbits/GTK
In directory sc8-pr-cvs1:/tmp/cvs-serv32451/src/cbits/GTK
Modified Files:
Frame.c Menu.c Window.c
Log Message:
Use GnomeApp as toplevel widget instead of GtkWindow
Index: Frame.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Frame.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Frame.c 1 May 2003 19:35:36 -0000 1.8
--- Frame.c 5 Jul 2003 06:42:38 -0000 1.9
***************
*** 109,113 ****
widget = gClientWidget;
else
! widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(gClientWidget), gtk_notebook_get_current_page(GTK_NOTEBOOK(gClientWidget)));
if (!widget)
--- 109,114 ----
widget = gClientWidget;
else
! widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(gClientWidget),
! gtk_notebook_get_current_page(GTK_NOTEBOOK(gClientWidget)));
if (!widget)
***************
*** 159,163 ****
widget = gClientWidget;
else
! widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(gClientWidget), gtk_notebook_get_current_page(GTK_NOTEBOOK(gClientWidget)));
if (!widget)
--- 160,165 ----
widget = gClientWidget;
else
! widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(gClientWidget),
! gtk_notebook_get_current_page(GTK_NOTEBOOK(gClientWidget)));
if (!widget)
***************
*** 201,211 ****
void createMDIFrame()
{
- GtkWidget *box;
GtkWidget *notebook_menu, *menu_item, *pages_menu;
GSList *group;
/* Create the window. */
! gFrameWidget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
! gtk_window_set_title(GTK_WINDOW(gFrameWidget), gAppName);
gtk_signal_connect (GTK_OBJECT(gFrameWidget), "delete-event",
GTK_SIGNAL_FUNC(frame_delete_handler),
--- 203,211 ----
void createMDIFrame()
{
GtkWidget *notebook_menu, *menu_item, *pages_menu;
GSList *group;
/* Create the window. */
! gFrameWidget = gnome_app_new(gAppName, gAppName);
gtk_signal_connect (GTK_OBJECT(gFrameWidget), "delete-event",
GTK_SIGNAL_FUNC(frame_delete_handler),
***************
*** 221,230 ****
NULL);
- box = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(gFrameWidget), box);
-
/* Create the menubar. */
gMenuBar = gtk_menu_bar_new();
! gtk_box_pack_start(GTK_BOX(box), gMenuBar, FALSE, FALSE, 0);
/* Create client(notebook) */
--- 221,227 ----
NULL);
/* Create the menubar. */
gMenuBar = gtk_menu_bar_new();
! gnome_app_set_menus(GNOME_APP(gFrameWidget), GTK_MENU_BAR(gMenuBar));
/* Create client(notebook) */
***************
*** 235,239 ****
GTK_SIGNAL_FUNC(frame_switch_page_handler),
NULL);
! gtk_box_pack_end(GTK_BOX(box), gClientWidget, TRUE, TRUE, 0);
gtk_window_maximize(GTK_WINDOW(gFrameWidget));
--- 232,236 ----
GTK_SIGNAL_FUNC(frame_switch_page_handler),
NULL);
! gnome_app_set_contents(GNOME_APP(gFrameWidget),gClientWidget);
gtk_window_maximize(GTK_WINDOW(gFrameWidget));
***************
*** 295,303 ****
void createSDIFrame()
{
- GtkWidget *box;
-
/* Create the window. */
! gFrameWidget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
! gtk_window_set_title(GTK_WINDOW(gFrameWidget), gAppName);
gtk_signal_connect (GTK_OBJECT(gFrameWidget), "delete-event",
GTK_SIGNAL_FUNC(frame_delete_handler),
--- 292,297 ----
void createSDIFrame()
{
/* Create the window. */
! gFrameWidget = gnome_app_new(gAppName, gAppName);
gtk_signal_connect (GTK_OBJECT(gFrameWidget), "delete-event",
GTK_SIGNAL_FUNC(frame_delete_handler),
***************
*** 319,326 ****
NULL);
-
- box = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(gFrameWidget), box);
-
gtk_window_add_accel_group (GTK_WINDOW (gFrameWidget), gtk_accel_group_new());
--- 313,316 ----
Index: Menu.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Menu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Menu.c 23 Apr 2003 21:48:52 -0000 1.7
--- Menu.c 5 Jul 2003 06:42:38 -0000 1.8
***************
*** 12,17 ****
{
gMenuBar = gtk_menu_bar_new();
- gtk_box_pack_start(GTK_BOX(GTK_BIN(gFrameWidget)->child), gMenuBar, FALSE, TRUE, 0);
gtk_widget_show(gMenuBar);
}
--- 12,17 ----
{
gMenuBar = gtk_menu_bar_new();
gtk_widget_show(gMenuBar);
+ gnome_app_set_menus(GNOME_APP(gFrameWidget), GTK_MENU_BAR(gMenuBar));
}
Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Window.c 1 May 2003 19:35:36 -0000 1.17
--- Window.c 5 Jul 2003 06:42:38 -0000 1.18
***************
*** 234,238 ****
{
handleWindowResize(widget,allocation->width-4,allocation->height-4);
! handleWindowReLayout(widget);
};
--- 234,238 ----
{
handleWindowResize(widget,allocation->width-4,allocation->height-4);
! handleWindowReLayout(widget);
};
***************
*** 309,319 ****
{
gClientWidget = sw;
! gtk_box_pack_end(GTK_BOX(GTK_BIN(gFrameWidget)->child), sw, TRUE, TRUE, 0);
}
gtk_widget_realize(viewport);
! gdk_window_set_events(viewport->window,
! gdk_window_get_events(viewport->window) | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
!
return sw;
--- 309,321 ----
{
gClientWidget = sw;
! gnome_app_set_contents(GNOME_APP(gFrameWidget),sw);
}
gtk_widget_realize(viewport);
! gdk_window_set_events(viewport->window, gdk_window_get_events(viewport->window)
! | GDK_BUTTON_RELEASE_MASK
! | GDK_POINTER_MOTION_MASK
! | GDK_ENTER_NOTIFY_MASK
! | GDK_LEAVE_NOTIFY_MASK);
return sw;
***************
*** 643,652 ****
GtkWidget *widget = window;
- printf("1 %p\n", window);
gtk_signal_connect (GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed),
&widget);
handleWindowDismiss(widget);
- printf("2\n");
return (widget == NULL);
}
--- 645,652 ----
|
