svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / editors / space_nla / nla_header.c
index ef850df1c59e36636959b9f9e6299d1bc155e80b..0f6b77da6f54a3eaf6d2d97af9f5c13aeb3c8f76 100644 (file)
@@ -65,13 +65,13 @@ static void do_viewmenu(bContext *C, void *arg, int event)
        
 }
 
-static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        ScrArea *curarea= CTX_wm_area(C);
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, handle->region, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
@@ -104,7 +104,7 @@ void nla_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_nla_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
@@ -112,9 +112,6 @@ void nla_header_buttons(const bContext *C, ARegion *ar)
        if((sa->flag & HEADER_NO_PULLDOWN)==0) {
                int xmax;
                
-               /* pull down menus */
-               uiBlockSetEmboss(block, UI_EMBOSSP);
-               
                xmax= GetButStringLength("View");
                uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C), 
                                                 "View", xco, yco-2, xmax-3, 24, "");