dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 773:d57561c34c3a

Add dw_scrollbox_get_pos() and dw_scrollbox_get_range() Change font for groupbox to default to bold font Enable dw_window_set_bitmap() to work with bitmap buttons (allows changing icon on a button) Some checks for NULL pointers before freeing

author	mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 19 Mar 2011 01:19:59 +0000
parents	f25ed69adb47
children	19a632499344

comparison

equal deleted inserted replaced

-:b28ec71cfc88
+:d57561c34c3a
 char **xpm_data = NULL;
 int x, y, extra_width=0,text_width,text_height;
 int width,height;
 va_start(args, format);
-vsprintf(outbuf, format, args);
+vsnprintf(outbuf, 999, format, args);
 va_end(args);
 entrywindow = dw_window_new(HWND_DESKTOP, title, flStyle);
 mainbox = dw_box_new(DW_VERT, 10);
 dw_box_pack_start(entrywindow, mainbox, 0, 0, TRUE, TRUE, 0);
 gtk_widget_show(tmp);
 DW_MUTEX_UNLOCK;
 return tmp;
 }
-#ifdef INCOMPLETE
+#ifndef INCOMPLETE
 /*
 * Create a new scrollable Box to be packed.
 * Parameters:
 *       type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
 *       pad: Number of pixels to pad around the box.
 gtk_widget_show(tmp);
 DW_MUTEX_UNLOCK;
 return tmp;
 }
+/*
+* Returns the position of the scrollbar in the scrollbox
+* Parameters:
+*          handle: Handle to the scrollbox to be queried.
+*          orient: The vertical or horizontal scrollbar.
+*/
+int dw_scrollbox_get_pos(HWND handle, int orient)
+{
+int val = -1, _locked_by_me = FALSE;
+GtkAdjustment *adjustment;
+if (!handle)
+return -1;
+DW_MUTEX_LOCK;
+if ( orient == DW_HORZ )
+adjustment = gtk_scrolled_window_get_hadjustment( handle );
+else
+adjustment = gtk_scrolled_window_get_vadjustment( handle );
+if (adjustment)
+val = _round_value(adjustment->value);
+DW_MUTEX_UNLOCK;
+return val;
+}
+/*
+* Gets the range for the scrollbar in the scrollbox.
+* Parameters:
+*          handle: Handle to the scrollbox to be queried.
+*          orient: The vertical or horizontal scrollbar.
+*/
+int API dw_scrollbox_get_range(HWND handle, int orient)
+{
+int range = -1, _locked_by_me = FALSE;
+GtkAdjustment *adjustment;
+if (!handle)
+return -1;
+DW_MUTEX_LOCK;
+if ( orient == DW_HORZ )
+adjustment = gtk_scrolled_window_get_hadjustment( handle );
+else
+adjustment = gtk_scrolled_window_get_vadjustment( handle );
+if (adjustment)
+{
+range = _round_value(adjustment->upper);
+}
+DW_MUTEX_UNLOCK;
+return range;
+}
 #endif
 /*
 * Create a new Group Box to be packed.
 * Parameters:
 *       pad: Number of pixels to pad around the box.
 *       title: Text to be displayined in the group outline.
 */
 HWND dw_groupbox_new(int type, int pad, char *title)
 {
-GtkWidget *tmp, *frame;
+GtkWidget *tmp, *frame, *label;
+PangoFontDescription *pfont;
+PangoContext *pcontext;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 frame = gtk_frame_new(NULL);
 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
 gtk_frame_set_label(GTK_FRAME(frame), title && *title ? title : NULL);
+/*
+* Get the current font for the frame's label and make it bold
+*/
+label = gtk_frame_get_label_widget(GTK_FRAME(frame));
+pcontext = gtk_widget_get_pango_context( label );
+if ( pcontext )
+{
+pfont = pango_context_get_font_description( pcontext );
+if ( pfont )
+{
+pango_font_description_set_weight( pfont, PANGO_WEIGHT_BOLD );
+gtk_widget_modify_font( label, pfont );
+}
+}
 tmp = gtk_table_new(1, 1, FALSE);
 gtk_container_border_width(GTK_CONTAINER(tmp), pad);
 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_boxpad", GINT_TO_POINTER(pad));
 gtk_object_set_data(GTK_OBJECT(frame), "_dw_boxhandle", (gpointer)tmp);
 gtk_container_add(GTK_CONTAINER(frame), tmp);
 gtk_widget_show(tmp);
 gtk_widget_show(frame);
 DW_MUTEX_UNLOCK;
 return frame;
 }
 /*
 * Create a new MDI Frame to be packed.
 * Parameters:
 #else
 tmp = gdk_pixmap_create_from_xpm(handle->window, &bitmap, &_colors[DW_CLR_PALEGRAY], file);
 #endif
 }
-if(tmp)
+if (tmp)
 {
+if ( GTK_IS_BUTTON(handle) )
+{
+#if GTK_MAJOR_VERSION < 2
+GtkWidget *pixmap = GTK_BUTTON(handle)->child;
+gtk_pixmap_set(GTK_PIXMAP(pixmap), tmp, bitmap);
+#else
+GtkWidget *pixmap = gtk_button_get_image( GTK_BUTTON(handle) );
+gtk_image_set_from_pixmap(GTK_IMAGE(pixmap), tmp, bitmap);
+#endif
+}
+else
+{
 #if GTK_MAJOR_VERSION > 1
 gtk_image_set_from_pixmap(GTK_IMAGE(handle), tmp, bitmap);
 #else
 gtk_pixmap_set(GTK_PIXMAP(handle), tmp, bitmap);
 #endif
+}
 }
 DW_MUTEX_UNLOCK;
 }
 /*
 memcpy(&newtitles[1], titles, sizeof(char *) * count);
 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
 _dw_container_setup(handle, newflags, newtitles, count + 1, 1, 1);
-free(newtitles);
+if ( newtitles) free(newtitles);
-free(newflags);
+if ( newflags ) free(newflags);
 return TRUE;
 }
 /*
 * Obtains an icon from a module (or header in GTK).
 if ( gc )
 {
 /*
 * If we have a bitmap (mask) in the source pixmap, then set the clipping region
 */
-if ( srcp->bitmap )
+if ( srcp && srcp->bitmap )
 {
 gdk_gc_set_clip_mask( gc, srcp->bitmap );
 gdk_gc_set_clip_origin( gc, xdest, ydest );
 }
 gdk_draw_pixmap( dest ? dest->window : destp->pixmap, gc, src ? src->window : srcp->pixmap, xsrc, ysrc, xdest, ydest, width, height );
 /*
 * Reset the clipping region
 */
-if ( srcp->bitmap )
+if ( srcp && srcp->bitmap )
 {
 gdk_gc_set_clip_mask( gc, NULL );
 gdk_gc_set_clip_origin( gc, 0, 0 );
 }
 gdk_gc_unref( gc );

Mercurial > dwindows

comparison gtk/dw.c @ 773:d57561c34c3a