#ifdef wxUSE_LIBJPEG changed to #if wxUSELIBJPEG

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index f3717c44bffec885234a81d188bf5b4492ee391b..d38e19be9219f5255d8bc87056f68bdcd44a5cb4 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)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__
@@ -34,7 +34,9 @@ class WXDLLEXPORT wxPrintInfo;
 class WXDLLEXPORT wxCommand;
 class WXDLLEXPORT wxCommandProcessor;
 class WXDLLEXPORT wxFileHistory;
+#if wxUSE_CONFIG
 class WXDLLEXPORT wxConfigBase;
+#endif
 
 #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>
-#  ifdef _MSC_VER
+#  ifdef __VISUALC__
       using namespace std;
 #  endif
 #endif
@@ -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);
+#if wxUSE_CONFIG
   virtual void FileHistoryLoad(wxConfigBase& config);
   virtual void FileHistorySave(wxConfigBase& config);
+#endif
   virtual void FileHistoryAddFilesToMenu();
   virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
  protected:
@@ -400,7 +404,7 @@ 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");
 
   // Extend event processing to search the document manager's event table
   virtual bool ProcessEvent(wxEvent& event);
@@ -512,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