Applied patch [ 774837 ] OGL wxLineShape::HitTest: smaller region
Also fixed .dsp file to reflect oglmisc.cpp name Fixed some warnings Added test for wxUSE_PROLOGIO git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,6 +87,8 @@ wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
|
||||
|
||||
wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
|
||||
{
|
||||
#if wxUSE_PROLOGIO
|
||||
|
||||
wxDocument::SaveObject(stream);
|
||||
char buf[400];
|
||||
(void) wxGetTempFileName("diag", buf);
|
||||
@@ -96,16 +98,17 @@ wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
|
||||
wxTransferFileToStream(buf, stream);
|
||||
|
||||
wxRemoveFile(buf);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
return stream;
|
||||
}
|
||||
|
||||
wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
|
||||
{
|
||||
#if wxUSE_PROLOGIO
|
||||
wxDocument::LoadObject(stream);
|
||||
|
||||
|
||||
char buf[400];
|
||||
(void) wxGetTempFileName("diag", buf);
|
||||
|
||||
@@ -114,6 +117,7 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
|
||||
diagram.DeleteAllShapes();
|
||||
diagram.LoadFile(buf);
|
||||
wxRemoveFile(buf);
|
||||
#endif
|
||||
|
||||
return stream;
|
||||
}
|
||||
@@ -546,6 +550,8 @@ void MyEvtHandler::OnEndSize(double x, double y)
|
||||
/*
|
||||
* Diagram
|
||||
*/
|
||||
|
||||
#if wxUSE_PROLOGIO
|
||||
|
||||
bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
|
||||
{
|
||||
@@ -568,6 +574,8 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* New shapes
|
||||
*/
|
||||
|
Reference in New Issue
Block a user