Various small fixes

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 755506cfeb949b913cf9b72879e32cc316bd83b4..ba1b413a12808bfcb516a46b5c4c956320adb869 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -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


@@ -342,8 +344,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 +516,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