Mercurial > dwindows
comparison gtk/dw.c @ 1491:d77b8cf25f04
Code cleanup and removed some erroneous code for GTK in dw_window_new().
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 24 Dec 2011 18:57:46 +0000 |
parents | 5cfbf2715eec |
children | 79c99c612725 |
comparison
equal
deleted
inserted
replaced
1490:5393b56ec6d0 | 1491:d77b8cf25f04 |
---|---|
3447 flags |= GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE; | 3447 flags |= GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE; |
3448 | 3448 |
3449 if(flStyle & DW_FCF_SIZEBORDER) | 3449 if(flStyle & DW_FCF_SIZEBORDER) |
3450 flags |= GDK_DECOR_RESIZEH | GDK_DECOR_BORDER; | 3450 flags |= GDK_DECOR_RESIZEH | GDK_DECOR_BORDER; |
3451 | 3451 |
3452 if(flStyle & DW_FCF_BORDER || flStyle & DW_FCF_DLGBORDER) | 3452 if(flStyle & (DW_FCF_BORDER | DW_FCF_DLGBORDER)) |
3453 flags |= GDK_DECOR_BORDER; | 3453 flags |= GDK_DECOR_BORDER; |
3454 | 3454 |
3455 #if GTK_MAJOR_VERSION > 1 | |
3455 if(flStyle & DW_FCF_MAXIMIZE) | 3456 if(flStyle & DW_FCF_MAXIMIZE) |
3456 { | |
3457 flags &= ~DW_FCF_MAXIMIZE; | |
3458 #if GTK_MAJOR_VERSION > 1 | |
3459 gtk_window_maximize(GTK_WINDOW(tmp)); | 3457 gtk_window_maximize(GTK_WINDOW(tmp)); |
3460 #endif | 3458 |
3461 } | |
3462 if(flStyle & DW_FCF_MINIMIZE) | 3459 if(flStyle & DW_FCF_MINIMIZE) |
3463 { | |
3464 flags &= ~DW_FCF_MINIMIZE; | |
3465 #if GTK_MAJOR_VERSION > 1 | |
3466 gtk_window_iconify(GTK_WINDOW(tmp)); | 3460 gtk_window_iconify(GTK_WINDOW(tmp)); |
3467 #endif | 3461 #endif |
3468 } | 3462 |
3469 #if GTK_CHECK_VERSION(2,10,0) | 3463 #if GTK_CHECK_VERSION(2,10,0) |
3470 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */ | 3464 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */ |
3471 if(!(flStyle & (DW_FCF_CLOSEBUTTON | DW_FCF_SYSMENU))) | 3465 gtk_window_set_deletable(GTK_WINDOW(tmp), (flStyle & (DW_FCF_CLOSEBUTTON | DW_FCF_SYSMENU)) ? TRUE : FALSE); |
3472 gtk_window_set_deletable(GTK_WINDOW(tmp), FALSE); | |
3473 #endif | 3466 #endif |
3474 | 3467 |
3475 gdk_window_set_decorations(tmp->window, flags); | 3468 gdk_window_set_decorations(tmp->window, flags); |
3476 if(!flags) | 3469 if(!flags) |
3477 gtk_window_set_decorated(GTK_WINDOW(tmp), FALSE); | 3470 gtk_window_set_decorated(GTK_WINDOW(tmp), FALSE); |