From: <ma...@us...> - 2003-12-20 08:51:58
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv11077/src Modified Files: Images.h MainDlg.h Log Message: Fixed bugged inlines Index: Images.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Images.h 20 Dec 2003 03:37:26 -0000 1.17 +++ Images.h 20 Dec 2003 08:51:54 -0000 1.18 @@ -40,7 +40,7 @@ wxBitmap& MakeToolImage(const wxString &name, const wxString &image); int tool_img_width, tool_img_height; void LoadImages(); - inline wxBitmap& GetImage(const wxString &name); + wxBitmap& GetImage(const wxString &name); void UpdateImages(wxWindow *parent); void CalcToolBitmapSize(const wxArrayString &names); private: Index: MainDlg.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- MainDlg.h 19 Dec 2003 23:50:12 -0000 1.13 +++ MainDlg.h 20 Dec 2003 08:51:55 -0000 1.14 @@ -102,8 +102,8 @@ long style, wxLocale &m_locale ); /* Constructor */ ~CMainDlg(); /* Destructor */ - inline void CreateMyToolBar(bool gen_images = false); /* Creates tbar */ - inline void CreateMyMenuBar(); /* (re)Creates menubar */ + void CreateMyToolBar(bool gen_images = false); /* Creates tbar */ + void CreateMyMenuBar(); /* (re)Creates menubar */ void AddPage( /* Adds new page to frame */ wxPanel *page, const wxString &short_title, const wxString &long_title, const wxString &image, wxWindowID = -1, @@ -145,7 +145,7 @@ void CreateSysTray(); /* Creates system tray icon */ void LoadAndShowDialogPages(); /* Loads dialog pages */ void ConnectToAnyServer(); /* Sends "connect" command to core */ - inline bool SetActivePage(const wxString &to_show); /* Displays page */ + bool SetActivePage(const wxString &to_show); /* Displays page */ void ShowGUISettingsDlg(); /* Displays GUI settings dialog */ void UpdateToolBar(); /* Updates toolbar buttons */ void UpdateMenuBar(); /* Updates menubar objects */ |