Rebake after adding libs html and xml to samples using lib adv

[wxWidgets.git] / contrib / samples / ogl / studio / doc.cpp

diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
index 0516794afd32599793ea76d5eb382b2ffea70518..4af72a6ad49c7d7ff503d500401fa6230b34334d 100644 (file)
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -53,6 +49,7 @@ bool csDiagramDocument::OnCloseDocument()
   return true;
 }
 
   return true;
 }
 

+#if wxUSE_PROLOGIO

 bool csDiagramDocument::OnSaveDocument(const wxString& file)
 {
   if (file == wxEmptyString)
 bool csDiagramDocument::OnSaveDocument(const wxString& file)
 {
   if (file == wxEmptyString)


@@ -97,9 +94,10 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
   SetFilename(file, true);
   Modify(false);
   UpdateAllViews();
   SetFilename(file, true);
   Modify(false);
   UpdateAllViews();

-  
+

   return true;
 }
   return true;
 }

+#endif // wxUSE_PROLOGIO

 
 
 /*
 
 
 /*


@@ -120,7 +118,7 @@ csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
 
 csDiagramCommand::~csDiagramCommand()
 {
 
 csDiagramCommand::~csDiagramCommand()
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -147,14 +145,14 @@ void csDiagramCommand::InsertState(csCommandState* state)
 // Schedule all lines connected to the states to be cut.
 void csDiagramCommand::RemoveLines()
 {
 // Schedule all lines connected to the states to be cut.
 void csDiagramCommand::RemoveLines()
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
         wxShape* shape = state->GetShapeOnCanvas();
         wxASSERT( (shape != NULL) );
 
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
         wxShape* shape = state->GetShapeOnCanvas();
         wxASSERT( (shape != NULL) );
 

-        wxNode *node1 = shape->GetLines().GetFirst();
+        wxObjectList::compatibility_iterator node1 = shape->GetLines().GetFirst();

         while (node1)
         {
             wxLineShape *line = (wxLineShape *)node1->GetData();
         while (node1)
         {
             wxLineShape *line = (wxLineShape *)node1->GetData();


@@ -172,7 +170,7 @@ void csDiagramCommand::RemoveLines()
 
 csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 {
 
 csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -185,7 +183,7 @@ csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 
 bool csDiagramCommand::Do()
 {
 
 bool csDiagramCommand::Do()
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -200,7 +198,7 @@ bool csDiagramCommand::Undo()
 {
     // Undo in reverse order, so e.g. shapes get added
     // back before the lines do.
 {
     // Undo in reverse order, so e.g. shapes get added
     // back before the lines do.

-    wxNode* node = m_states.GetLast();
+    wxObjectList::compatibility_iterator node = m_states.GetLast();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -268,7 +266,7 @@ bool csCommandState::Do()
         ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
 
         m_shapeOnCanvas->Unlink();
         ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
 
         m_shapeOnCanvas->Unlink();

-        
+

         m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
 
         m_savedState = m_shapeOnCanvas;
         m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
 
         m_savedState = m_shapeOnCanvas;


@@ -347,7 +345,7 @@ bool csCommandState::Do()
 
         lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
             lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());
 
         lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
             lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());

-      
+

         lineShape->Show(true);
 
         wxClientDC dc(lineShape->GetCanvas());
         lineShape->Show(true);
 
         wxClientDC dc(lineShape->GetCanvas());


@@ -475,7 +473,7 @@ bool csCommandState::Do()
 
         if (isSelected)
             m_shapeOnCanvas->Select(true, & dc);
 
         if (isSelected)
             m_shapeOnCanvas->Select(true, & dc);

-        
+

         m_doc->Modify(true);
         m_doc->UpdateAllViews();
 
         m_doc->Modify(true);
         m_doc->UpdateAllViews();