Rewrote wxRadioBox (recompile)

[wxWidgets.git] / utils / ogl / src / basic.cpp

diff --git a/utils/ogl/src/basic.cpp b/utils/ogl/src/basic.cpp
index 240dfc58eae6fc354faab00a64aef5b5f641982c..ce0ed54a71f760d3a7f3c5742453f0034596ad5e 100644 (file)
--- a/utils/ogl/src/basic.cpp
+++ b/utils/ogl/src/basic.cpp
@@ -1056,11 +1056,11 @@ bool wxShape::AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, co
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
+bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,

                                        double x, double y)
 {
   if (!GetAttachmentMode())
                                        double x, double y)
 {
   if (!GetAttachmentMode())

-      return;
+      return FALSE;

 
   int newAttachment, oldAttachment;
   double distance;
 
   int newAttachment, oldAttachment;
   double distance;


@@ -1069,7 +1069,7 @@ void wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
   // the user has moved the point to
   bool hit = HitTest(x, y, &newAttachment, &distance);
   if (!hit)
   // the user has moved the point to
   bool hit = HitTest(x, y, &newAttachment, &distance);
   if (!hit)

-    return;
+    return FALSE;

 
   EraseLinks(dc);
 
 
   EraseLinks(dc);
 


@@ -1138,6 +1138,8 @@ void wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
     newOrdering.Append(to_move);
 
   GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);
     newOrdering.Append(to_move);
 
   GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);

+
+  return TRUE;

 }
 
 void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
 }
 
 void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)


@@ -1467,15 +1469,15 @@ void wxShape::Move(wxDC& dc, double x, double y, bool display)
   double old_x = m_xpos;
   double old_y = m_ypos;
 
   double old_x = m_xpos;
   double old_y = m_ypos;
 

-  m_xpos = x; m_ypos = y;
-

   if (!GetEventHandler()->OnMovePre(dc, x, y, old_x, old_y, display))
   {
   if (!GetEventHandler()->OnMovePre(dc, x, y, old_x, old_y, display))
   {

-    m_xpos = old_x;
-    m_ypos = old_y;
+//    m_xpos = old_x;
+//    m_ypos = old_y;

     return;
   }
 
     return;
   }
 

+  m_xpos = x; m_ypos = y;
+

   ResetControlPoints();
 
   if (display)
   ResetControlPoints();
 
   if (display)