fixed previous revision: call wxControl's, not wxButton's DoGetBestSize

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

diff --git a/contrib/samples/ogl/studio/view.cpp b/contrib/samples/ogl/studio/view.cpp
index fff71b629b1531e170a3b243d2332fbff2843295..f3073fc44a521952eda26724d692da84251b0506 100644 (file)
--- a/contrib/samples/ogl/studio/view.cpp
+++ b/contrib/samples/ogl/studio/view.cpp
@@ -198,25 +198,23 @@ void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 wxShape *csDiagramView::FindFirstSelectedShape(void)
 {
   csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-  wxShape *theShape = NULL;
-  wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
   while (node)
   {
     wxShape *eachShape = (wxShape *)node->GetData();
     if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected())
     {
-      theShape = eachShape;
-      node = NULL;
+      return eachShape;
     }
     else node = node->GetNext();
   }
-  return theShape;
+  return NULL;
 }
 
 void csDiagramView::FindSelectedShapes(wxList& selections, wxClassInfo* toFind)
 {
   csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-  wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
   while (node)
   {
     wxShape *eachShape = (wxShape *)node->GetData();
@@ -331,7 +329,7 @@ void csDiagramView::DoCut(wxList& shapes)
     {
         csDiagramCommand* cmd = new csDiagramCommand(_T("Cut"), doc);
 
-        wxNode* node = shapes.GetFirst();
+        wxObjectList::compatibility_iterator node = shapes.GetFirst();
         while (node)
         {
             wxShape *theShape = (wxShape*) node->GetData();
@@ -363,8 +361,8 @@ void csDiagramView::DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxSt
     {
         csDiagramCommand* command = new csDiagramCommand(op, doc);
 
-        wxNode* node = shapes.GetFirst();
-        wxNode* node1 = oldShapes.GetFirst();
+        wxObjectList::compatibility_iterator node = shapes.GetFirst();
+        wxObjectList::compatibility_iterator node1 = oldShapes.GetFirst();
         while (node && node1)
         {
             wxShape *theShape = (wxShape*) node->GetData();
@@ -410,7 +408,7 @@ void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
 
         csDiagramCommand* cmd = new csDiagramCommand(_T("Change colour"), doc);
 
-        wxNode* node = selections.GetFirst();
+        wxObjectList::compatibility_iterator node = selections.GetFirst();
         while (node)
         {
             wxShape *theShape = (wxShape*) node->GetData();
@@ -479,7 +477,7 @@ void csDiagramView::ApplyPointSize(int pointSize)
     {
         csDiagramCommand* cmd = new csDiagramCommand(_T("Point size"), doc);
 
-        wxNode* node = selections.GetFirst();
+        wxObjectList::compatibility_iterator node = selections.GetFirst();
         while (node)
         {
             wxShape *theShape = (wxShape*) node->GetData();
@@ -531,7 +529,7 @@ void csDiagramView::SelectAll(bool select)
         wxList selections;
         FindSelectedShapes(selections);
 
-        wxNode* node = selections.GetFirst();
+        wxObjectList::compatibility_iterator node = selections.GetFirst();
         while (node)
         {
             wxShape *theShape = (wxShape*) node->GetData();
@@ -544,7 +542,7 @@ void csDiagramView::SelectAll(bool select)
     else
     {
         csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-        wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
+        wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
         while (node)
         {
             wxShape *eachShape = (wxShape *)node->GetData();
@@ -579,7 +577,7 @@ void csDiagramView::OnToggleArrowTool(wxCommandEvent& WXUNUSED(event))
     {
         csDiagramCommand* cmd = new csDiagramCommand(stateName, doc);
 
-        wxNode* node = selections.GetFirst();
+        wxObjectList::compatibility_iterator node = selections.GetFirst();
         while (node)
         {
             wxLineShape *theShape = (wxLineShape*) node->GetData();
@@ -634,7 +632,7 @@ void csDiagramView::ReflectPointSize(int pointSize)
 void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
 {
     bool haveArrow = false;
-    wxNode *node = lineShape->GetArrows().GetFirst();
+    wxObjectList::compatibility_iterator node = lineShape->GetArrows().GetFirst();
     while (node)
     {
       wxArrowHead *arrow = (wxArrowHead *)node->GetData();
@@ -651,7 +649,7 @@ void csDiagramView::OnAlign(wxCommandEvent& event)
     // Make a copy of the selections, keeping only those shapes
     // that are top-level non-line shapes.
     wxList selections;
-    wxNode* node = GetSelectionList().GetFirst();
+    wxObjectList::compatibility_iterator node = GetSelectionList().GetFirst();
     while (node)
     {
         wxShape* shape = (wxShape*) node->GetData();
@@ -751,7 +749,7 @@ void csDiagramView::OnNewLinePoint(wxCommandEvent& WXUNUSED(event))
     csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
     csDiagramCommand* cmd = new csDiagramCommand(_T("New line point"), doc);
 
-    wxNode* node = m_selections.GetFirst();
+    wxObjectList::compatibility_iterator node = m_selections.GetFirst();
     while (node)
     {
         wxShape* shape = (wxShape*) node->GetData();
@@ -772,7 +770,7 @@ void csDiagramView::OnCutLinePoint(wxCommandEvent& WXUNUSED(event))
     csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
     csDiagramCommand* cmd = new csDiagramCommand(_T("Cut line point"), doc);
 
-    wxNode* node = m_selections.GetFirst();
+    wxObjectList::compatibility_iterator node = m_selections.GetFirst();
     while (node)
     {
         wxShape* shape = (wxShape*) node->GetData();
@@ -793,7 +791,7 @@ void csDiagramView::OnStraightenLines(wxCommandEvent& WXUNUSED(event))
     csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
     csDiagramCommand* cmd = new csDiagramCommand(_T("Straighten lines"), doc);
 
-    wxNode* node = m_selections.GetFirst();
+    wxObjectList::compatibility_iterator node = m_selections.GetFirst();
     while (node)
     {
         wxShape* shape = (wxShape*) node->GetData();
@@ -999,7 +997,7 @@ void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
     min_y = wxMin(y, sg_initialY);
     max_y = wxMax(y, sg_initialY);
 
-    wxNode *node = GetDiagram()->GetShapeList()->GetFirst();
+    wxObjectList::compatibility_iterator node = GetDiagram()->GetShapeList()->GetFirst();
     while (node)
     {
         wxShape *shape = (wxShape *)node->GetData();