Fixed the "Can't open file" message in ReadDIB so that it actually

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 755506cfeb949b913cf9b72879e32cc316bd83b4..c7ea657142c74eb4aa07843718c143f10d46ece6 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__


@@ -34,7 +34,9 @@ class WXDLLEXPORT wxPrintInfo;
 class WXDLLEXPORT wxCommand;
 class WXDLLEXPORT wxCommandProcessor;
 class WXDLLEXPORT wxFileHistory;
 class WXDLLEXPORT wxCommand;
 class WXDLLEXPORT wxCommandProcessor;
 class WXDLLEXPORT wxFileHistory;

+#if wxUSE_CONFIG

 class WXDLLEXPORT wxConfigBase;
 class WXDLLEXPORT wxConfigBase;

+#endif

 
 #if wxUSE_IOSTREAMH
 // N.B. BC++ doesn't have istream.h, ostream.h
 
 #if wxUSE_IOSTREAMH
 // N.B. BC++ doesn't have istream.h, ostream.h


@@ -42,7 +44,7 @@ class WXDLLEXPORT wxConfigBase;
 #else
 #  include <istream>
 #  include <ostream>
 #else
 #  include <istream>
 #  include <ostream>

-#  ifdef _MSC_VER
+#  ifdef __VISUALC__

       using namespace std;
 #  endif
 #endif
       using namespace std;
 #  endif
 #endif


@@ -155,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; }


@@ -185,8 +188,11 @@ 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);

+
+#if WXWIN_COMPATIBILITY

   // Defeat compiler warning
   // 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);
 
   // Extend event processing to search the document's event table
   virtual bool ProcessEvent(wxEvent& event);


@@ -195,7 +201,8 @@ class WXDLLEXPORT wxView: public wxEvtHandler
   // The function then notifies the document manager.
   virtual void Activate(bool activate);
 
   // 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);
 
 #if wxUSE_PRINTING_ARCHITECTURE
   virtual wxPrintout *OnCreatePrintout(void);


@@ -342,8 +349,10 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
   virtual wxString GetHistoryFile(int i) const;
   virtual void FileHistoryUseMenu(wxMenu *menu);
   virtual void FileHistoryRemoveMenu(wxMenu *menu);
   virtual wxString GetHistoryFile(int i) const;
   virtual void FileHistoryUseMenu(wxMenu *menu);
   virtual void FileHistoryRemoveMenu(wxMenu *menu);

+#if wxUSE_CONFIG

   virtual void FileHistoryLoad(wxConfigBase& config);
   virtual void FileHistorySave(wxConfigBase& config);
   virtual void FileHistoryLoad(wxConfigBase& config);
   virtual void FileHistorySave(wxConfigBase& config);

+#endif

   virtual void FileHistoryAddFilesToMenu();
   virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
  protected:
   virtual void FileHistoryAddFilesToMenu();
   virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
  protected:


@@ -512,8 +521,10 @@ class WXDLLEXPORT wxFileHistory: public wxObject
   // Remove menu from the list (MDI child may be closing)
   virtual void RemoveMenu(wxMenu *menu);
 
   // Remove menu from the list (MDI child may be closing)
   virtual void RemoveMenu(wxMenu *menu);
 

+#if wxUSE_CONFIG

   virtual void Load(wxConfigBase& config);
   virtual void Save(wxConfigBase& config);
   virtual void Load(wxConfigBase& config);
   virtual void Save(wxConfigBase& config);

+#endif

 
   virtual void AddFilesToMenu();
   virtual void AddFilesToMenu(wxMenu* menu); // Single menu
 
   virtual void AddFilesToMenu();
   virtual void AddFilesToMenu(wxMenu* menu); // Single menu