diff options
| author | Michel Selten <michel@mselten.demon.nl> | 2003-11-15 21:40:51 +0300 |
|---|---|---|
| committer | Michel Selten <michel@mselten.demon.nl> | 2003-11-15 21:40:51 +0300 |
| commit | ad9e1e44d86ee04413f36735805f3c46bd1b752f (patch) | |
| tree | ca2eba270348226e94466aa1c394b1dadc8c237e /source/blender/src/header_buttonswin.c | |
| parent | d8f860509835710187dd3d17e1fbc574b8d16295 (diff) | |
Fixed compiler errors. The new function uiBlockBeginAlign() has been updated to
be smarter. The result was only 1 argument instead of 2 were needed.
Unfortunately, not all calls to uiBlockBeginAlign() were updated accordingly.
Diffstat (limited to 'source/blender/src/header_buttonswin.c')
| -rw-r--r-- | source/blender/src/header_buttonswin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/header_buttonswin.c b/source/blender/src/header_buttonswin.c index 2d3cc7057c2..cc64a40fc04 100644 --- a/source/blender/src/header_buttonswin.c +++ b/source/blender/src/header_buttonswin.c @@ -418,7 +418,7 @@ void buts_buttons(void) // uiButClearFlag(but, UI_ICON_RIGHT); // this type has both flags set, and draws icon right.. uhh // xco+= 90-XIC+10; //} - uiBlockBeginAlign(block, 'h'); + uiBlockBeginAlign(block); uiDefIconButS(block, ROW, B_REDR, ICON_GAME, xco+=XIC, 0, XIC, YIC, &(G.buts->mainb), 0.0, (float)CONTEXT_LOGIC, 0, 0, "Logic (F4) "); uiDefIconButS(block, ROW, B_REDR, ICON_SCRIPT, xco+=XIC, 0, XIC, YIC, &(G.buts->mainb), 0.0, (float)CONTEXT_SCRIPT, 0, 0, "Script "); uiDefIconButS(block, ROW, B_REDR, ICON_MATERIAL_DEHLT,xco+=XIC, 0, XIC, YIC, &(G.buts->mainb), 0.0, (float)CONTEXT_SHADING, 0, 0, "Shading (F5) "); @@ -433,7 +433,7 @@ void buts_buttons(void) uiBlockSetEmboss(block, UI_EMBOSS); // normal switch(G.buts->mainb) { case CONTEXT_SCENE: - uiBlockBeginAlign(block, 'h'); + uiBlockBeginAlign(block); uiDefIconButC(block, ROW, B_REDR, ICON_SCENE, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_SCENE]), 1.0, (float)TAB_SCENE_RENDER, 0, 0, "Render buttons "); uiDefIconButC(block, ROW, B_REDR, ICON_ANIM, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_SCENE]), 1.0, (float)TAB_SCENE_ANIM, 0, 0, "Anim/playback buttons"); uiDefIconButC(block, ROW, B_REDR, ICON_SOUND, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_SCENE]), 1.0, (float)TAB_SCENE_SOUND, 0, 0, "Sound block buttons"); @@ -443,7 +443,7 @@ void buts_buttons(void) break; case CONTEXT_SHADING: - uiBlockBeginAlign(block, 'h'); + uiBlockBeginAlign(block); uiDefIconButC(block, ROW, B_BUTSPREVIEW, ICON_LAMP, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_SHADING]), 1.0, (float)TAB_SHADING_LAMP, 0, 0, "Lamp buttons"); uiDefIconButC(block, ROW, B_BUTSPREVIEW, ICON_MATERIAL, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_SHADING]), 1.0, (float)TAB_SHADING_MAT, 0, 0, "Material buttons"); uiDefIconButC(block, ROW, B_BUTSPREVIEW, ICON_TEXTURE, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_SHADING]), 1.0, (float)TAB_SHADING_TEX, 0, 0, "Texture buttons"); |