Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The _menu_info_ptr_ is now initialized correctly. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13434 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-07-05 01:42:56 +00:00
parent f5d8fa6e60
commit 06fe6a428c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kits/interface/InterfaceDefs.cpp
View File

@ -55,6 +55,9 @@ extern "C" status_t _fini_interface_kit_();
using namespace BPrivate; using namespace BPrivate;
menu_info *_menu_info_ptr_;
static status_t static status_t
mode2parms(uint32 space, uint32 *out_space, int32 *width, int32 *height) mode2parms(uint32 space, uint32 *out_space, int32 *width, int32 *height)
{ {
@ -770,9 +773,10 @@ _init_interface_kit_()
BTextView::sWidthSem = widthSem; BTextView::sWidthSem = widthSem;
BTextView::sWidthAtom = 0; BTextView::sWidthAtom = 0;
BTextView::sWidths = new _BWidthBuffer_; BTextView::sWidths = new _BWidthBuffer_;
_init_global_fonts(); _init_global_fonts();
_menu_info_ptr_ = &BMenu::sMenuInfo;
status_t status = load_menu_settings(BMenu::sMenuInfo); status_t status = load_menu_settings(BMenu::sMenuInfo);
// TODO: fill the other static members // TODO: fill the other static members
@ -972,7 +976,6 @@ int32 *get_token_list(team_id app, int32 *count);
void do_bring_to_front_team(BRect zoomRect, team_id app, bool zoom); void do_bring_to_front_team(BRect zoomRect, team_id app, bool zoom);
void do_minimize_team(BRect zoomRect, team_id team, bool zoom); void do_minimize_team(BRect zoomRect, team_id team, bool zoom);
menu_info *_menu_info_ptr_ = NULL;
void void
do_window_action(int32 window_id, int32 action, do_window_action(int32 window_id, int32 action,