wxGLCanvas works again

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 86ad9c3801415558e2b9e19f998c1272f87913ed..7c42886d13da30f1ae62bb956399fee8237447b7 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:
 {
   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; }
   ~wxView(void);
 
   inline wxDocument *GetDocument(void) const { return m_viewDocument; }


@@ -188,7 +189,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
   // Override to do cleanup/veto close
   virtual bool OnClose(bool deleteWindow);
 
   // Override to do cleanup/veto close
   virtual bool OnClose(bool deleteWindow);
 

-#ifdef WXWIN_COMPATIBILITY
+#if WXWIN_COMPATIBILITY

   // Defeat compiler warning
   bool OnClose(void) { return wxEvtHandler::OnClose(); }
 #endif
   // Defeat compiler warning
   bool OnClose(void) { return wxEvtHandler::OnClose(); }
 #endif


@@ -539,7 +540,7 @@ class WXDLLEXPORT wxFileHistory: public wxObject
 
  protected:
   // Last n files
 
  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)
   // Number of files saved
   int               m_fileHistoryN;
   // Menus to maintain (may need several for an MDI app)