dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 1451:95ca625b8ffc

Removed GtkVbox and associated code from top-level windows on GTK. Replaced it with a with a GtkTable based vertical box. More than one item can be packed into the top-level window on GTK.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 14 Dec 2011 05:11:57 +0000
parents	fbaec6e5df63
children	dbe16031ffb4

comparison

equal deleted inserted replaced

-:145edf67013e
+:95ca625b8ffc
 gtk_mdi_put(GTK_MDI(hwndOwner), tmp, 100, 75, label);
 }
 else
 #endif
 {
+GtkWidget *box = dw_box_new(DW_VERT, 0);
 last_window = tmp = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW(tmp), title);
 if(!(flStyle & DW_FCF_SIZEBORDER))
 gtk_window_set_policy(GTK_WINDOW(tmp), FALSE, FALSE, TRUE);
 if(hwndOwner)
 gdk_window_reparent(GTK_WIDGET(tmp)->window, GTK_WIDGET(hwndOwner)->window, 0, 0);
 if(flStyle & DW_FCF_SIZEBORDER)
 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_size", GINT_TO_POINTER(1));
+gtk_container_add(GTK_CONTAINER(tmp), box);
+gtk_object_set_data(GTK_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
 }
 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_style", GINT_TO_POINTER(flStyle));
 DW_MUTEX_UNLOCK;
 return tmp;
 }
 * If there is no box already packed into the "location", the menu will not appear
 * so tell the user.
 */
 HMENUI dw_menubar_new(HWND location)
 {
+int _locked_by_me = FALSE;
+GtkAccelGroup *accel_group;
 GtkWidget *box;
-int _locked_by_me = FALSE;
+HMENUI tmp = 0;
-GtkAccelGroup *accel_group;
-HMENUI tmp;
+DW_MUTEX_LOCK;
+if(GTK_IS_WINDOW(location) &&
-DW_MUTEX_LOCK;
+(box = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(location), "_dw_boxhandle")))
-tmp = gtk_menu_bar_new();
+{
-box = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(location));
+/* If there is an existing menu bar, remove it */
-gtk_widget_show(tmp);
+GtkWidget *oldmenu = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(location), "_dw_menubar");
-accel_group = gtk_accel_group_new();
+if(oldmenu)
-gtk_object_set_data(GTK_OBJECT(tmp), "_dw_accel", (gpointer)accel_group);
+gtk_widget_destroy(oldmenu);
+/* Create a new menu bar */
-if (box)
+tmp = gtk_menu_bar_new();
-gtk_box_pack_end(GTK_BOX(box), tmp, FALSE, FALSE, 0);
+gtk_widget_show(tmp);
-else
+accel_group = gtk_accel_group_new();
-fprintf(stderr,"dw_menubar_new(): Coding error: You MUST pack a box into the window in which this menubar is to be added BEFORE calling this function.\n");
+gtk_object_set_data(GTK_OBJECT(tmp), "_dw_accel", (gpointer)accel_group);
+gtk_object_set_data(GTK_OBJECT(location), "_dw_menubar", (gpointer)tmp);
+dw_box_pack_end(box, (HWND)tmp, -1, -1, TRUE, FALSE, 0);
+}
 DW_MUTEX_UNLOCK;
 return tmp;
 }
 /*
 return;
 }
 DW_MUTEX_LOCK;
+/* If this is a special box, like: Window, Groupbox, Scrollbox...
+* get the internal box handle.
+*/
 if((tmp  = gtk_object_get_data(GTK_OBJECT(box), "_dw_boxhandle")))
 box = tmp;
+/* Can't pack nothing with GTK, so create an empty label */
 if(!item)
 {
 item = gtk_label_new("");
 gtk_widget_show_all(item);
 }
+/* Check if the item to be packed is a special box */
 tmpitem = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxhandle");
+/* Make sure our target box is valid */
 if(GTK_IS_TABLE(box))
 {
 int boxcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(box), "_dw_boxcount"));
 int boxtype = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(box), "_dw_boxtype"));
 int x, y;
 gtk_radio_button_set_group(GTK_RADIO_BUTTON(item), group);
 }
 else
 gtk_object_set_data(GTK_OBJECT(box), "_dw_group", (gpointer)item);
 }
-}
-else
-{
-GtkWidget *vbox = gtk_object_get_data(GTK_OBJECT(box), "_dw_vbox");
-if(!vbox)
-{
-vbox = gtk_vbox_new(FALSE, 0);
-gtk_object_set_data(GTK_OBJECT(box), "_dw_vbox", vbox);
-gtk_container_add(GTK_CONTAINER(box), vbox);
-gtk_widget_show(vbox);
-}
-gtk_container_set_border_width(GTK_CONTAINER(box), pad);
-if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
-{
-GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
-/* NOTE: I left in the ability to pack boxes with a size,
-*       this eliminates that by forcing the size to 0.
-*/
-height = width = 0;
-if(eventbox)
-{
-int boxpad = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"));
-gtk_container_add(GTK_CONTAINER(eventbox), item);
-gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad);
-item = eventbox;
-}
-}
-else
-{
-/* Only show warning if item is not a box */
-warn = TRUE;
-}
-gtk_box_pack_end(GTK_BOX(vbox), item, TRUE, TRUE, 0);
-gtk_widget_set_usize(item, width, height);
-gtk_object_set_user_data(GTK_OBJECT(box), vbox);
 }
 DW_MUTEX_UNLOCK;
 if(warn)
 {

Mercurial > dwindows

comparison gtk/dw.c @ 1451:95ca625b8ffc