For non-Unicode added #include <ctype.h> and <string.h> to avoid some missing

[wxWidgets.git] / include / wx / docview.h

diff --git a/include/wx/docview.h b/include/wx/docview.h
index d38e19be9219f5255d8bc87056f68bdcd44a5cb4..c7ea657142c74eb4aa07843718c143f10d46ece6 100644 (file)
--- 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);