X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ae6f8d0938c98259564847648083f2938f28fa..f6f98ecccd755993c8ba6354281fad271917be25:/wxPython/contrib/xrc/xrc.i diff --git a/wxPython/contrib/xrc/xrc.i b/wxPython/contrib/xrc/xrc.i index dbf81e43ec..2f481c01d1 100644 --- a/wxPython/contrib/xrc/xrc.i +++ b/wxPython/contrib/xrc/xrc.i @@ -14,7 +14,7 @@ %{ -#include "export.h" +#include "wxPython.h" #include "wx/xrc/xmlres.h" %} @@ -89,6 +89,8 @@ public: // Loads menubar from resource. Returns NULL on failure. wxMenuBar *LoadMenuBar(const wxString& name); + %name(LoadMenuBarOnFrame) wxMenuBar *LoadMenuBar(wxWindow *parent, const wxString& name); + // Loads toolbar wxToolBar *LoadToolBar(wxWindow *parent, const wxString& name); @@ -122,7 +124,7 @@ public: // Returns numeric ID that is equivalent to string id used in XML // resource. To be used in event tables // Macro XMLID is provided for convenience - static int GetXRCID(const char *str_id); + static int GetXRCID(const wxString& str_id); // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a) long GetVersion() const;