Mercurial > dwindows
comparison os2/dw.c @ 1745:7dd1659c2693
Fixes for the new localization function on OS/2 and GTK3.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 04 Jun 2012 22:44:51 +0000 |
parents | 535e8c19a13d |
children | 76b24619f6fa |
comparison
equal
deleted
inserted
replaced
1744:535e8c19a13d | 1745:7dd1659c2693 |
---|---|
493 if(data) | 493 if(data) |
494 free(data); | 494 free(data); |
495 } | 495 } |
496 else if(strncmp(tmpbuf, "#37", 4)==0) | 496 else if(strncmp(tmpbuf, "#37", 4)==0) |
497 { | 497 { |
498 char *coltitle = (char *)dw_window_get_data(handle, "_dw_coltitle"); | |
499 | |
498 dw_container_clear(handle, FALSE); | 500 dw_container_clear(handle, FALSE); |
499 if(wd && dw_window_get_data(handle, "_dw_container")) | 501 if(wd && dw_window_get_data(handle, "_dw_container")) |
500 { | 502 { |
501 void *oldflags = wd->data; | 503 void *oldflags = wd->data; |
502 | |
503 wd->data = NULL; | 504 wd->data = NULL; |
504 free(oldflags); | 505 free(oldflags); |
505 } | 506 } |
507 if(coltitle) | |
508 free(coltitle); | |
506 } | 509 } |
507 | 510 |
508 if(wd->oldproc) | 511 if(wd->oldproc) |
509 WinSubclassWindow(handle, wd->oldproc); | 512 WinSubclassWindow(handle, wd->oldproc); |
510 | 513 |
8983 memcpy(&newtitles[2], titles, sizeof(char *) * count); | 8986 memcpy(&newtitles[2], titles, sizeof(char *) * count); |
8984 memcpy(&newflags[2], flags, sizeof(unsigned long) * count); | 8987 memcpy(&newflags[2], flags, sizeof(unsigned long) * count); |
8985 | 8988 |
8986 dw_container_setup(handle, newflags, newtitles, count + 2, count ? 2 : 0); | 8989 dw_container_setup(handle, newflags, newtitles, count + 2, count ? 2 : 0); |
8987 | 8990 |
8988 if(coltitle) | |
8989 { | |
8990 dw_window_set_data(handle, "_dw_coltitle", NULL); | |
8991 free(coltitle); | |
8992 } | |
8993 free(newtitles); | 8991 free(newtitles); |
8994 free(newflags); | 8992 free(newflags); |
8995 return DW_ERROR_NONE; | 8993 return DW_ERROR_NONE; |
8996 } | 8994 } |
8997 | 8995 |