merged another part of Alex's work (LoadMenuBar w/ parent)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-15 23:37:55 +00:00
parent 1ad12a5699
commit 4a1b95962f
4 changed files with 12 additions and 8 deletions
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -125,7 +125,8 @@ public:
    wxMenu *LoadMenu(const wxString& name);

    // Loads menubar from resource. Returns NULL on failure.
-    wxMenuBar *LoadMenuBar(const wxString& name);
+    wxMenuBar *LoadMenuBar(wxWindow *parent, const wxString& name);
+    wxMenuBar *LoadMenuBar(const wxString& name) { return LoadMenuBar(NULL, name); }

 #if wxUSE_TOOLBAR
    // Loads toolbar