Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-24 07:54:43 +00:00
parent 1c5f3f511d
commit 9f13cedb5e
1 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/samples/ogl/ogledit/doc.cpp
View File

@@ -53,6 +53,8 @@ bool DiagramDocument::OnCloseDocument(void)
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream) wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
{ {
#if wxUSE_PROLOGIO
wxDocument::SaveObject(stream); wxDocument::SaveObject(stream);
char buf[400]; char buf[400];
@@ -63,11 +65,15 @@ wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
wxRemoveFile(buf); wxRemoveFile(buf);
#endif
return stream; return stream;
} }
wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream) wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
{ {
#if wxUSE_PROLOGIO
wxDocument::LoadObject(stream); wxDocument::LoadObject(stream);
char buf[400]; char buf[400];
@@ -79,6 +85,8 @@ wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
diagram.LoadFile(buf); diagram.LoadFile(buf);
wxRemoveFile(buf); wxRemoveFile(buf);
#endif
return stream; return stream;
} }
#else #else
@@ -127,8 +135,8 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
*/ */
DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy, DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
bool sel, wxShape *theShape, wxShape *fs, wxShape *ts): bool sel, wxShape *theShape, wxShape *fs, wxShape *ts)
wxCommand(true, name) :wxCommand(true, name)
{ {
doc = ddoc; doc = ddoc;
cmd = command; cmd = command;
@@ -144,8 +152,8 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
deleteShape = false; deleteShape = false;
} }
DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape): DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape)
wxCommand(true, name) :wxCommand(true, name)
{ {
doc = ddoc; doc = ddoc;
cmd = command; cmd = command;
@@ -161,8 +169,8 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
shapePen = NULL; shapePen = NULL;
} }
DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape): DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape)
wxCommand(true, name) :wxCommand(true, name)
{ {
doc = ddoc; doc = ddoc;
cmd = command; cmd = command;