Applied patch/bug [ 748226 ] OGL samples does not follow settings from setup.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-05 17:26:35 +00:00
parent c1a23315cd
commit 6999716b96
11 changed files with 31 additions and 4 deletions

View File

@@ -92,7 +92,9 @@ wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
char buf[400];
(void) wxGetTempFileName("diag", buf);
#if wxUSE_PROLOGIO
diagram.SaveFile(buf);
#endif
wxTransferFileToStream(buf, stream);
@@ -113,7 +115,11 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
wxTransferStreamToFile(stream, buf);
diagram.DeleteAllShapes();
#if wxUSE_PROLOGIO
diagram.LoadFile(buf);
#endif
wxRemoveFile(buf);
return stream;
@@ -548,6 +554,7 @@ void MyEvtHandler::OnEndSize(double x, double y)
* Diagram
*/
#if wxUSE_PROLOGIO
bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
{
wxDiagram::OnShapeSave(db, shape, expr);
@@ -568,6 +575,7 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
delete[] label;
return TRUE;
}
#endif
/*
* New shapes