applied patch for compilation with gcc 3.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -40,8 +40,8 @@ public:
|
||||
|
||||
void Draw(wxDC *dc);
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
|
||||
wxSTD istream& LoadObject(wxSTD istream& text_stream);
|
||||
#else
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
@@ -60,8 +60,8 @@ public:
|
||||
~DrawingDocument(void);
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
|
||||
wxSTD istream& LoadObject(wxSTD istream& text_stream);
|
||||
#else
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
@@ -93,8 +93,8 @@ class TextEditDocument: public wxDocument
|
||||
private:
|
||||
public:
|
||||
/*
|
||||
ostream& SaveObject(ostream& stream);
|
||||
istream& LoadObject(istream& stream);
|
||||
wxSTD ostream& SaveObject(wxSTD ostream& stream);
|
||||
wxSTD istream& LoadObject(wxSTD istream& stream);
|
||||
*/
|
||||
virtual bool OnSaveDocument(const wxString& filename);
|
||||
virtual bool OnOpenDocument(const wxString& filename);
|
||||
|
Reference in New Issue
Block a user