comparison gtk/dw.c @ 764:f25ed69adb47

Attempt at support for DW_BS_NOBORDER for GTK. Theoretically should work on OS/2 and Windows already.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 18 Mar 2011 00:41:21 +0000
parents 388f2a48aaae
children d57561c34c3a
comparison
equal deleted inserted replaced
763:2cace4e6e69a 764:f25ed69adb47
4026 */ 4026 */
4027 HWND dw_bitmapbutton_new(char *text, unsigned long id) 4027 HWND dw_bitmapbutton_new(char *text, unsigned long id)
4028 { 4028 {
4029 GtkWidget *tmp; 4029 GtkWidget *tmp;
4030 GtkWidget *bitmap; 4030 GtkWidget *bitmap;
4031 GtkTooltips *tooltips; 4031 GtkTooltips *tooltips;
4032 int _locked_by_me = FALSE; 4032 int _locked_by_me = FALSE;
4033 4033
4034 DW_MUTEX_LOCK; 4034 DW_MUTEX_LOCK;
4035 tmp = gtk_button_new(); 4035 tmp = gtk_button_new();
4036 bitmap = dw_bitmap_new(id); 4036 bitmap = dw_bitmap_new(id);
9266 else if(GTK_IS_FRAME(handle)) 9266 else if(GTK_IS_FRAME(handle))
9267 { 9267 {
9268 GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_label"); 9268 GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_label");
9269 if(tmp && GTK_IS_LABEL(tmp)) 9269 if(tmp && GTK_IS_LABEL(tmp))
9270 handle2 = tmp; 9270 handle2 = tmp;
9271 }
9272 else if(GTK_IS_BUTTON(handle))
9273 {
9274 if(mask & DW_BS_NOBORDER)
9275 {
9276 if(style & DW_BS_NOBORDER)
9277 {
9278 gtk_button_set_relief((GtkButton *)handle, GTK_RELIEF_NONE);
9279 }
9280 else
9281 {
9282 gtk_button_set_relief((GtkButton *)handle, GTK_RELIEF_NORMAL);
9283 }
9284 }
9271 } 9285 }
9272 if ( GTK_IS_LABEL(handle2) ) 9286 if ( GTK_IS_LABEL(handle2) )
9273 { 9287 {
9274 gfloat x=DW_LEFT, y=DW_CENTER; 9288 gfloat x=DW_LEFT, y=DW_CENTER;
9275 /* horizontal... */ 9289 /* horizontal... */