X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..c96faa7c9b1926d63a2fff32ac4508d3138a7bee:/include/wx/docview.h

diff --git a/include/wx/docview.h b/include/wx/docview.h
index d38e19be92..7c42886d13 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -157,7 +157,8 @@ class WXDLLEXPORT wxView: public wxEvtHandler
 {
   DECLARE_ABSTRACT_CLASS(wxView)
  public:
-  wxView(wxDocument *doc = (wxDocument *) NULL);
+//  wxView(wxDocument *doc = (wxDocument *) NULL);
+  wxView();
   ~wxView(void);
 
   inline wxDocument *GetDocument(void) const { return m_viewDocument; }
@@ -187,8 +188,11 @@ class WXDLLEXPORT wxView: public wxEvtHandler
 
   // Override to do cleanup/veto close
   virtual bool OnClose(bool deleteWindow);
+
+#if WXWIN_COMPATIBILITY
   // Defeat compiler warning
-  inline bool OnClose(void) { return wxEvtHandler::OnClose(); }
+  bool OnClose(void) { return wxEvtHandler::OnClose(); }
+#endif
 
   // Extend event processing to search the document's event table
   virtual bool ProcessEvent(wxEvent& event);
@@ -197,7 +201,8 @@ class WXDLLEXPORT wxView: public wxEvtHandler
   // The function then notifies the document manager.
   virtual void Activate(bool activate);
 
-  inline wxDocManager *GetDocumentManager(void) const { return m_viewDocument->GetDocumentManager(); }
+  wxDocManager *GetDocumentManager(void) const
+    { return m_viewDocument->GetDocumentManager(); }
 
 #if wxUSE_PRINTING_ARCHITECTURE
   virtual wxPrintout *OnCreatePrintout(void);
@@ -535,7 +540,7 @@ class WXDLLEXPORT wxFileHistory: public wxObject
 
  protected:
   // Last n files
-  char**            m_fileHistory;
+  wxChar**          m_fileHistory;
   // Number of files saved
   int               m_fileHistoryN;
   // Menus to maintain (may need several for an MDI app)