Mercurial > hg > xemacs-beta
diff src/toolbar-msw.c @ 442:abe6d1db359e r21-2-36
Import from CVS: tag r21-2-36
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:35:02 +0200 |
| parents | 8de8e3f6228a |
| children | 183866b06e0b |
line wrap: on
line diff
--- a/src/toolbar-msw.c Mon Aug 13 11:33:40 2007 +0200 +++ b/src/toolbar-msw.c Mon Aug 13 11:35:02 2007 +0200 @@ -46,15 +46,7 @@ #define TOOLBAR_ID_BIAS 16 #define TOOLBAR_HANDLE(f,p) \ GetDlgItem(FRAME_MSWINDOWS_HANDLE(f), TOOLBAR_ID_BIAS + p) -#ifndef TB_SETIMAGELIST -#define TB_SETIMAGELIST (WM_USER + 48) -#define TB_GETIMAGELIST (WM_USER + 49) -#define TB_SETDISABLEDIMAGELIST (WM_USER + 54) -#define TB_GETDISABLEDIMAGELIST (WM_USER + 55) -#endif -#ifndef TB_SETPADDING -#define TB_SETPADDING (WM_USER + 87) -#endif + #define MSWINDOWS_BUTTON_SHADOW_THICKNESS 2 #define MSWINDOWS_BLANK_SIZE 5 #define MSWINDOWS_MINIMUM_TOOLBAR_SIZE 8 @@ -131,7 +123,7 @@ ShowWindow(toolbarwnd, SW_HIDE); } - FRAME_MSWINDOWS_TOOLBAR_CHECKSUM(f,pos)=0; + FRAME_MSWINDOWS_TOOLBAR_CHECKSUM (f, pos) = 0; SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0); } @@ -223,7 +215,7 @@ /* remove the old one */ mswindows_clear_toolbar (f, pos, 0); - FRAME_MSWINDOWS_TOOLBAR_CHECKSUM(f,pos)=checksum; + FRAME_MSWINDOWS_TOOLBAR_CHECKSUM (f, pos)=checksum; /* build up the data required by win32 fns. */ button_tbl = xnew_array_and_zero (TBBUTTON, nbuttons); @@ -384,10 +376,12 @@ CreateWindowEx ( WS_EX_WINDOWEDGE, TOOLBARCLASSNAME, NULL, - WS_CHILD | WS_VISIBLE + WS_CHILD | (style_3d ? WS_DLGFRAME : 0) - | TBSTYLE_TOOLTIPS | CCS_NORESIZE - | CCS_NOPARENTALIGN | CCS_NODIVIDER, + | TBSTYLE_TOOLTIPS + | CCS_NORESIZE + | CCS_NOPARENTALIGN | CCS_NODIVIDER + | CCS_ADJUSTABLE, x, y, bar_width, bar_height, FRAME_MSWINDOWS_HANDLE (f), (HMENU)(TOOLBAR_ID_BIAS + pos), @@ -573,9 +567,10 @@ mswindows_free_frame_toolbars (struct frame *f) { HWND twnd=NULL; -#define DELETE_TOOLBAR(pos) \ - mswindows_clear_toolbar(f, 0, pos); \ - if ((twnd=GetDlgItem(FRAME_MSWINDOWS_HANDLE(f), TOOLBAR_ID_BIAS + pos))) \ +#define DELETE_TOOLBAR(pos) \ + mswindows_clear_toolbar(f, pos, 0); \ + if ((twnd=GetDlgItem(FRAME_MSWINDOWS_HANDLE(f), \ + TOOLBAR_ID_BIAS + pos))) \ DestroyWindow(twnd) DELETE_TOOLBAR(TOP_TOOLBAR);