From ce956b5de725f3e293a3da7e3b2c27ffd35d4374 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Thu, 28 Apr 2005 07:06:36 +0000 Subject: [PATCH] Moved the "_init_global_fonts()" call above "load_menu_settings()", as the latter messes with be_plain_font. Reordered the headers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12486 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/InterfaceDefs.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kits/interface/InterfaceDefs.cpp b/src/kits/interface/InterfaceDefs.cpp index bd58dced4b..5a13ddd346 100644 --- a/src/kits/interface/InterfaceDefs.cpp +++ b/src/kits/interface/InterfaceDefs.cpp @@ -26,25 +26,25 @@ // Description: Global functions and variables for the Interface Kit // //------------------------------------------------------------------------------ - -#include #include -#include +#include +#include #include #include -#include -#include -#include #include -#include +#include // Private definitions not placed in public headers extern "C" void _init_global_fonts(); extern "C" status_t _fini_interface_kit_(); +#include #include #include +#include +#include + using namespace BPrivate; @@ -629,12 +629,12 @@ _init_interface_kit_() BTextView::sWidthAtom = 0; BTextView::sWidths = new _BWidthBuffer_; + _init_global_fonts(); + status_t status = load_menu_settings(BMenu::sMenuInfo); // TODO: fill the other static members - _init_global_fonts(); - return status; }