Mercurial > dwindows

changeset 1089:b58032a619b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added new functions for 2.1 to the template, and updated the box packing examples to use the new unified method to reduce redundancy.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 28 Jun 2011 20:30:29 +0000
parents 97c221691665
children b905fd8e7fd1
files template/dw.c
diffstat 1 files changed, 81 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
--- a/template/dw.c	Tue Jun 28 20:17:22 2011 +0000
+++ b/template/dw.c	Tue Jun 28 20:30:29 2011 +0000
@@ -670,32 +670,31 @@
     return 0;
 }
 
-/*
- * Pack windows (widgets) into a box from the end (or bottom).
- * Parameters:
- *       box: Window handle of the box to be packed into.
- *       item: Window handle of the item to be back.
- *       width: Width in pixels of the item or -1 to be self determined.
- *       height: Height in pixels of the item or -1 to be self determined.
- *       hsize: TRUE if the window (widget) should expand horizontally to fill space given.
- *       vsize: TRUE if the window (widget) should expand vertically to fill space given.
- *       pad: Number of pixels of padding around the item.
- */
-void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
+/* Internal box packing function called by the other 3 functions */
+void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
 {
     Box *thisbox;
-    int z;
+    int z, x = 0;
     Item *tmpitem, *thisitem;
 
     thisbox = _dw_get_window_pointer(box);
     thisitem = thisbox->items;
 
+    /* Do some sanity bounds checking */
+    if(index < 0)
+       index = 0;
+    if(index > thisbox->count)
+       index = thisbox->count;
+        
     /* Duplicate the existing data */
     tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 
     for(z=0;z<thisbox->count;z++)
     {
-       tmpitem[z+1] = thisitem[z];
+       if(z == index)
+          x++;
+       tmpitem[x] = thisitem[z];
+       x++;
     }
 
     /* Sanity checks */
@@ -706,23 +705,23 @@
 
     /* Fill in the item data appropriately */
     if(0 /* Test to see if "item" is a box */)
-       tmpitem[0].type = TYPEBOX;
+       tmpitem[index].type = TYPEBOX;
     else
-       tmpitem[0].type = TYPEITEM;
-
-    tmpitem[0].hwnd = item;
-    tmpitem[0].origwidth = tmpitem[0].width = width;
-    tmpitem[0].origheight = tmpitem[0].height = height;
-    tmpitem[0].pad = pad;
+       tmpitem[index].type = TYPEITEM;
+
+    tmpitem[index].hwnd = item;
+    tmpitem[index].origwidth = tmpitem[index].width = width;
+    tmpitem[index].origheight = tmpitem[index].height = height;
+    tmpitem[index].pad = pad;
     if(hsize)
-       tmpitem[0].hsize = SIZEEXPAND;
+       tmpitem[index].hsize = SIZEEXPAND;
     else
-       tmpitem[0].hsize = SIZESTATIC;
+       tmpitem[index].hsize = SIZESTATIC;
 
     if(vsize)
-       tmpitem[0].vsize = SIZEEXPAND;
+       tmpitem[index].vsize = SIZEEXPAND;
     else
-       tmpitem[0].vsize = SIZESTATIC;
+       tmpitem[index].vsize = SIZESTATIC;
 
     thisbox->items = tmpitem;
 
@@ -741,6 +740,23 @@
 }
 
 /*
+ * Pack windows (widgets) into a box at an arbitrary location.
+ * Parameters:
+ *       box: Window handle of the box to be packed into.
+ *       item: Window handle of the item to be back.
+ *       index: 0 based index of packed items. 
+ *       width: Width in pixels of the item or -1 to be self determined.
+ *       height: Height in pixels of the item or -1 to be self determined.
+ *       hsize: TRUE if the window (widget) should expand horizontally to fill space given.
+ *       vsize: TRUE if the window (widget) should expand vertically to fill space given.
+ *       pad: Number of pixels of padding around the item.
+ */
+void API dw_box_pack_at_index(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad)
+{
+    _dw_box_pack(box, item, index, width, height, hsize, vsize, pad, "dw_box_pack_at_index()");
+}
+
+/*
  * Pack windows (widgets) into a box from the start (or top).
  * Parameters:
  *       box: Window handle of the box to be packed into.
@@ -753,61 +769,26 @@
  */
 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
 {
-    Box *thisbox;
-    int z;
-    Item *tmpitem, *thisitem;
-
-    thisbox = _dw_get_window_pointer(box);
-    thisitem = thisbox->items;
-
-    /* Duplicate the existing data */
-    tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
-
-    for(z=0;z<thisbox->count;z++)
-    {
-       tmpitem[z] = thisitem[z];
-    }
-
-    /* Sanity checks */
-    if(vsize && !height)
-       height = 1;
-    if(hsize && !width)
-       width = 1;
-
-    /* Fill in the item data appropriately */
-    if(0 /* Test to see if "item" is a box */)
-       tmpitem[thisbox->count].type = TYPEBOX;
-    else
-       tmpitem[thisbox->count].type = TYPEITEM;
-
-    tmpitem[thisbox->count].hwnd = item;
-    tmpitem[thisbox->count].origwidth = tmpitem[thisbox->count].width = width;
-    tmpitem[thisbox->count].origheight = tmpitem[thisbox->count].height = height;
-    tmpitem[thisbox->count].pad = pad;
-    if(hsize)
-       tmpitem[thisbox->count].hsize = SIZEEXPAND;
-    else
-       tmpitem[thisbox->count].hsize = SIZESTATIC;
-
-    if(vsize)
-       tmpitem[thisbox->count].vsize = SIZEEXPAND;
-    else
-       tmpitem[thisbox->count].vsize = SIZESTATIC;
-
-    thisbox->items = tmpitem;
-
-    /* Update the item count */
-    thisbox->count++;
-
-    /* Add the item to the box */
-#if 0
-    /* Platform specific code to add item to box */
-    BoxAdd(box, item);
-#endif
-
-    /* Free the old data */
-    if(thisbox->count)
-       free(thisitem);
+    /* 65536 is the table limit on GTK... 
+     * seems like a high enough value we will never hit it here either.
+     */
+    _dw_box_pack(box, item, 65536, width, height, hsize, vsize, pad, "dw_box_pack_start()");
+}
+
+/*
+ * Pack windows (widgets) into a box from the end (or bottom).
+ * Parameters:
+ *       box: Window handle of the box to be packed into.
+ *       item: Window handle of the item to be back.
+ *       width: Width in pixels of the item or -1 to be self determined.
+ *       height: Height in pixels of the item or -1 to be self determined.
+ *       hsize: TRUE if the window (widget) should expand horizontally to fill space given.
+ *       vsize: TRUE if the window (widget) should expand vertically to fill space given.
+ *       pad: Number of pixels of padding around the item.
+ */
+void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
+{
+    _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
 }
 
 /*
@@ -2683,6 +2664,26 @@
     return NULL;
 }
 
+/* Allows the user to choose a font using the system's font chooser dialog.
+ * Parameters:
+ *       currfont: current font
+ * Returns:
+ *       A malloced buffer with the selected font or NULL on error.
+ */
+char * API dw_font_choose(char *currfont)
+{
+    return NULL;
+}
+
+/*
+ * Sets the default font used on text based widgets.
+ * Parameters:
+ *           fontname: Font name in Dynamic Windows format.
+ */
+void API dw_font_set_default(char *fontname)
+{
+}
+
 /*
  * Destroys a window and all of it's children.
  * Parameters: