Needed to add #include "wx/statusbr.h" to know that wxStatusBar is derived

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

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 02bf4c429bfd90455e82b918e6ff0030fd37a0ac..b489a61e47b936b53d23522c5a9b6143db3dd6f4 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "basic.h"
-#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"
 


@@ -34,7 +30,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>

-#include <math.h>

 
 #include "wx/ogl/ogl.h"
 
 
 #include "wx/ogl/ogl.h"
 


@@ -1313,7 +1308,7 @@ void wxShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment
 
   dc.SetLogicalFunction(OGLRBLF);
 
 
   dc.SetLogicalFunction(OGLRBLF);
 

-  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  wxPen dottedPen(*wxBLACK, 1, wxDOT);

   dc.SetPen(dottedPen);
   dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
   dc.SetPen(dottedPen);
   dc.SetBrush(* wxTRANSPARENT_BRUSH);
 


@@ -1358,7 +1353,7 @@ void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
 //  m_xpos = xx; m_ypos = yy;
   dc.SetLogicalFunction(OGLRBLF);
 
 //  m_xpos = xx; m_ypos = yy;
   dc.SetLogicalFunction(OGLRBLF);
 

-  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  wxPen dottedPen(*wxBLACK, 1, wxDOT);

   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 


@@ -1370,6 +1365,8 @@ void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
 
 void wxShape::OnEndDragLeft(double x, double y, int keys, int attachment)
 {
 
 void wxShape::OnEndDragLeft(double x, double y, int keys, int attachment)
 {

+  if (!m_draggable)
+    return;

   m_canvas->ReleaseMouse();
   if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
   {
   m_canvas->ReleaseMouse();
   if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
   {


@@ -2712,7 +2709,9 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
             double left = (double)(m_xpos - w/2.0);
             double right = (double)(m_xpos + w/2.0);
 
             double left = (double)(m_xpos - w/2.0);
             double right = (double)(m_xpos + w/2.0);
 

+#if 0

             /* bool isEnd = */ (line && line->IsEnd(this));
             /* bool isEnd = */ (line && line->IsEnd(this));

+#endif

 
             int physicalAttachment = LogicalToPhysicalAttachment(attachment);
 
 
             int physicalAttachment = LogicalToPhysicalAttachment(attachment);
 


@@ -3190,7 +3189,7 @@ bool wxShape::GetAttachmentPositionEdge(int attachment, double *x, double *y,
 // to logical (0 -> 1 if rotated by 90 degrees)
 int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
 {
 // to logical (0 -> 1 if rotated by 90 degrees)
 int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
 {

-    const double pi = 3.1415926535897932384626433832795 ;
+    const double pi = M_PI ;

     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {
     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {


@@ -3222,7 +3221,7 @@ int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
 // to physical (0 is always North)
 int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
 {
 // to physical (0 is always North)
 int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
 {

-    const double pi = 3.1415926535897932384626433832795 ;
+    const double pi = M_PI ;

     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {
     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {


@@ -3252,7 +3251,7 @@ int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
 
 void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
 {
 
 void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
 {

-    const double pi = 3.1415926535897932384626433832795 ;
+    const double pi = M_PI ;

     m_rotation = theta;
     if (m_rotation < 0.0)
     {
     m_rotation = theta;
     if (m_rotation < 0.0)
     {