Mercurial > dwindows
comparison os2/dw.c @ 1412:246aadf8fbd4
Fixes for the OS/2 code.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 02 Dec 2011 08:52:21 +0000 |
parents | 22ba64e357de |
children | f4fc4ea92511 |
comparison
equal
deleted
inserted
replaced
1411:22ba64e357de | 1412:246aadf8fbd4 |
---|---|
4692 dw_font_text_extents_get(handle, NULL, buf, &thiswidth, &thisheight); | 4692 dw_font_text_extents_get(handle, NULL, buf, &thiswidth, &thisheight); |
4693 dw_free(buf); | 4693 dw_free(buf); |
4694 } | 4694 } |
4695 | 4695 |
4696 /* Combobox */ | 4696 /* Combobox */ |
4697 if(strnicmp(tmpbuf, WC_COMBOBOX, strlen(WC_COMBOBOX)+1) == 0) | 4697 if(strncmp(tmpbuf, "#2", 3)==0) |
4698 { | 4698 { |
4699 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight); | 4699 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight); |
4700 thiswidth = 150; | 4700 thiswidth = 150; |
4701 extraheight = 4; | 4701 extraheight = 4; |
4702 if(thisheight < 18) | 4702 if(thisheight < 18) |
4703 thisheight = 18; | 4703 thisheight = 18; |
4704 } | 4704 } |
4705 else if(strnicmp(tmpbuf, WC_SPINBUTTON, strlen(WC_SPINBUTTON)+1) == 0) | 4705 /* Spinbutton */ |
4706 else if(strncmp(tmpbuf, "#32", 4)==0) | |
4706 { | 4707 { |
4707 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight); | 4708 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight); |
4708 thiswidth = 50; | 4709 thiswidth = 50; |
4709 } | 4710 } |
4710 else if(strnicmp(tmpbuf, WC_ENTRYFIELD, strlen(WC_ENTRYFIELD)+1) == 0) | 4711 /* Entryfield */ |
4712 else if(strncmp(tmpbuf, "#6", 3)==0) | |
4711 { | 4713 { |
4712 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight); | 4714 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight); |
4713 thiswidth = 150; | 4715 thiswidth = 150; |
4714 extraheight = 6; | 4716 extraheight = 6; |
4715 } | 4717 } |
4716 else if(strnicmp(tmpbuf, WC_BUTTON, strlen(WC_BUTTON)+1) == 0) | 4718 /* Button */ |
4719 else if(strncmp(tmpbuf, "#3", 3)==0) | |
4717 { | 4720 { |
4718 ULONG style = WinQueryWindowULong(handle, QWL_STYLE); | 4721 ULONG style = WinQueryWindowULong(handle, QWL_STYLE); |
4719 | 4722 |
4720 if(style & BS_AUTOCHECKBOX || style & BS_AUTORADIOBUTTON) | 4723 if(style & BS_AUTOCHECKBOX || style & BS_AUTORADIOBUTTON) |
4721 { | 4724 { |