Mercurial > dwindows
comparison dwtest.c @ 1038:2c2fcfeeffcc
Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
Attempt at allowing dw_window_set/get_font() work on groupbox labels on GTK.
Moved dwtest MDI notebook page into a DEPRECATED #ifdef to prevent tons of warnings on GTK3.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 26 May 2011 07:57:10 +0000 |
parents | 0802d6122ec7 |
children | b3674ea2909f |
comparison
equal
deleted
inserted
replaced
1037:6ad811834512 | 1038:2c2fcfeeffcc |
---|---|
1170 dw_window_redraw( filetoolbarbox ); | 1170 dw_window_redraw( filetoolbarbox ); |
1171 dw_window_redraw( mainwindow ); | 1171 dw_window_redraw( mainwindow ); |
1172 } | 1172 } |
1173 } | 1173 } |
1174 | 1174 |
1175 #ifdef DEPRECATED | |
1175 void mdi_add(void) | 1176 void mdi_add(void) |
1176 { | 1177 { |
1177 HWND mdibox, mdi, mdi1w, mdi1box, ef, mdi2w, mdi2box, bb; | 1178 HWND mdibox, mdi, mdi1w, mdi1box, ef, mdi2w, mdi2box, bb; |
1178 | 1179 |
1179 /* create a box to pack into the notebook page */ | 1180 /* create a box to pack into the notebook page */ |
1201 bb = dw_button_new("Browse", 0); | 1202 bb = dw_button_new("Browse", 0); |
1202 dw_box_pack_start(mdi2box, bb, 60, 30, FALSE, FALSE, 4); | 1203 dw_box_pack_start(mdi2box, bb, 60, 30, FALSE, FALSE, 4); |
1203 dw_window_set_size(mdi2w, 200, 200); | 1204 dw_window_set_size(mdi2w, 200, 200); |
1204 dw_window_show(mdi2w); | 1205 dw_window_show(mdi2w); |
1205 } | 1206 } |
1207 #endif | |
1206 | 1208 |
1207 void menu_add(void) | 1209 void menu_add(void) |
1208 { | 1210 { |
1209 HMENUI menuitem,menu; | 1211 HMENUI menuitem,menu; |
1210 | 1212 |
1287 ULONG notebookpage1; | 1289 ULONG notebookpage1; |
1288 ULONG notebookpage2; | 1290 ULONG notebookpage2; |
1289 ULONG notebookpage3; | 1291 ULONG notebookpage3; |
1290 ULONG notebookpage4; | 1292 ULONG notebookpage4; |
1291 ULONG notebookpage5; | 1293 ULONG notebookpage5; |
1294 #ifdef DEPRECATED | |
1292 ULONG notebookpage6; | 1295 ULONG notebookpage6; |
1296 #endif | |
1293 ULONG notebookpage7; | 1297 ULONG notebookpage7; |
1294 ULONG notebookpage8; | 1298 ULONG notebookpage8; |
1295 | 1299 |
1296 dw_init(TRUE, argc, argv); | 1300 dw_init(TRUE, argc, argv); |
1297 | 1301 |
1334 notebookbox5 = dw_box_new( BOXVERT, 5 ); | 1338 notebookbox5 = dw_box_new( BOXVERT, 5 ); |
1335 notebookpage5 = dw_notebook_page_new( notebook, 1, FALSE ); | 1339 notebookpage5 = dw_notebook_page_new( notebook, 1, FALSE ); |
1336 dw_notebook_pack( notebook, notebookpage5, notebookbox5 ); | 1340 dw_notebook_pack( notebook, notebookpage5, notebookbox5 ); |
1337 dw_notebook_page_set_text( notebook, notebookpage5, "buttons"); | 1341 dw_notebook_page_set_text( notebook, notebookpage5, "buttons"); |
1338 buttons_add(); | 1342 buttons_add(); |
1339 | 1343 |
1344 #ifdef DEPRECATED | |
1340 notebookbox6 = dw_box_new( BOXVERT, 5 ); | 1345 notebookbox6 = dw_box_new( BOXVERT, 5 ); |
1341 notebookpage6 = dw_notebook_page_new( notebook, 1, FALSE ); | 1346 notebookpage6 = dw_notebook_page_new( notebook, 1, FALSE ); |
1342 dw_notebook_pack( notebook, notebookpage6, notebookbox6 ); | 1347 dw_notebook_pack( notebook, notebookpage6, notebookbox6 ); |
1343 dw_notebook_page_set_text( notebook, notebookpage6, "mdi"); | 1348 dw_notebook_page_set_text( notebook, notebookpage6, "mdi"); |
1344 mdi_add(); | 1349 mdi_add(); |
1350 #endif | |
1345 | 1351 |
1346 notebookbox7 = dw_box_new( BOXVERT, 6 ); | 1352 notebookbox7 = dw_box_new( BOXVERT, 6 ); |
1347 notebookpage7 = dw_notebook_page_new( notebook, 1, FALSE ); | 1353 notebookpage7 = dw_notebook_page_new( notebook, 1, FALSE ); |
1348 dw_notebook_pack( notebook, notebookpage7, notebookbox7 ); | 1354 dw_notebook_pack( notebook, notebookpage7, notebookbox7 ); |
1349 dw_notebook_page_set_text( notebook, notebookpage7, "html"); | 1355 dw_notebook_page_set_text( notebook, notebookpage7, "html"); |