Added wxPoem sample; fixed some Dialog Editor problems; wxStaticBitmap and wxBitmapButton

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 7e63ff80f4aec4e2b627937d66528fb98b87ff2f..755506cfeb949b913cf9b72879e32cc316bd83b4 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -37,8 +37,8 @@ class WXDLLEXPORT wxFileHistory;
 class WXDLLEXPORT wxConfigBase;
 
 #if wxUSE_IOSTREAMH
 class WXDLLEXPORT wxConfigBase;
 
 #if wxUSE_IOSTREAMH

-#  include <istream.h>
-#  include <ostream.h>
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>

 #else
 #  include <istream>
 #  include <ostream>
 #else
 #  include <istream>
 #  include <ostream>


@@ -400,7 +400,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,
  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);
 
   // Extend event processing to search the document manager's event table
   virtual bool ProcessEvent(wxEvent& event);