Various small fixes

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index dc25795242e6e33309b8ca597b0a2988c7f7a9cc..ba1b413a12808bfcb516a46b5c4c956320adb869 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -34,10 +34,20 @@ class WXDLLEXPORT wxPrintInfo;
 class WXDLLEXPORT wxCommand;
 class WXDLLEXPORT wxCommandProcessor;
 class WXDLLEXPORT wxFileHistory;
+#if wxUSE_CONFIG
 class WXDLLEXPORT wxConfigBase;
+#endif
 
-class WXDLLIMPORT ostream;
-class WXDLLIMPORT istream;
+#if wxUSE_IOSTREAMH
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>
+#else
+#  include <istream>
+#  include <ostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif
 
 // Document manager flags
 #define wxDOC_SDI       1
@@ -334,8 +344,10 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
   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);
+#endif
   virtual void FileHistoryAddFilesToMenu();
   virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
  protected:
@@ -364,12 +376,11 @@ class WXDLLEXPORT wxDocChildFrame: public wxFrame
     long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxDocChildFrame(void);
 
-  bool OnClose(void);
   // Extend event processing to search the view's event table
   virtual bool ProcessEvent(wxEvent& event);
 
-//  void OldOnMenuCommand(int id);
   void OnActivate(wxActivateEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
 
   inline wxDocument *GetDocument(void) const { return m_childDocument; }
   inline wxView *GetView(void) const { return m_childView; }
@@ -393,17 +404,16 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame
  public:
   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");
+    long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
 
-  bool OnClose(void);
   // Extend event processing to search the document manager's event table
   virtual bool ProcessEvent(wxEvent& event);
 
-//  void OldOnMenuCommand(int id);
   wxDocManager *GetDocumentManager(void) const { return m_docManager; }
 
   void OnExit(wxCommandEvent& event);
   void OnMRUFile(wxCommandEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
 
  protected:
   wxDocManager *m_docManager;
@@ -506,8 +516,10 @@ class WXDLLEXPORT wxFileHistory: public wxObject
   // 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);
+#endif
 
   virtual void AddFilesToMenu();
   virtual void AddFilesToMenu(wxMenu* menu); // Single menu