X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/637f467a0639bf942ebeb466d056fa339bfdbdee..26ac5fadeaa4081fb0e19909d6152f75c64090bb:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index 63b3441488..45ed1c3be5 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __DOCH__ -#define __DOCH__ +#ifndef _WX_DOCH__ +#define _WX_DOCH__ #ifdef __GNUG__ #pragma interface "docview.h" @@ -355,7 +355,7 @@ class WXDLLEXPORT wxDocChildFrame: public wxFrame DECLARE_CLASS(wxDocChildFrame) public: - wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title, + wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"); ~wxDocChildFrame(void); @@ -387,7 +387,7 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame { DECLARE_CLASS(wxDocParentFrame) public: - wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, + wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME, const wxString& name = "frame");