Compile fix for sound without threads. Not sure

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

diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
index e05066d4029f247c3796d4af920f5f92aa6b59a5..6c3bb4d561d90a3ad0986860bac63c81e957bd0b 100644 (file)
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -24,29 +24,19 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#include <wx/wxexpr.h>
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif

 
 #ifdef new
 #undef new
 #endif
 
 
 #ifdef new
 #undef new
 #endif
 

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-

 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 

-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/canvas.h>
-#include <wx/ogl/ogldiag.h>
-#include <wx/ogl/misc.h>
-#include <wx/ogl/lines.h>
-#include <wx/ogl/composit.h>
+#include "wx/ogl/ogl.h"

 
 #define CONTROL_POINT_SIZE       6
 
 
 #define CONTROL_POINT_SIZE       6
 


@@ -61,8 +51,6 @@
 #define CONTROL_POINT_ENDPOINT_FROM 5
 #define CONTROL_POINT_LINE       6
 
 #define CONTROL_POINT_ENDPOINT_FROM 5
 #define CONTROL_POINT_LINE       6
 

-extern wxCursor *g_oglBullseyeCursor;
-

 IMPLEMENT_DYNAMIC_CLASS(wxShapeCanvas, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxShapeCanvas, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)


@@ -70,9 +58,15 @@ BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 

+const wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas");
+

 // Object canvas
 // Object canvas

-wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
-  wxScrolledWindow(parent, id, pos, size, style)
+wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxString& name):
+  wxScrolledWindow(parent, id, pos, size, style, name)

 {
   m_shapeDiagram = NULL;
   m_dragState = NoDragging;
 {
   m_shapeDiagram = NULL;
   m_dragState = NoDragging;


@@ -88,16 +82,17 @@ wxShapeCanvas::~wxShapeCanvas()
 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnPaint(wxPaintEvent& event)
+void wxShapeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxPaintDC dc(this);
 
     PrepareDC(dc);
 
 {
     wxPaintDC dc(this);
 
     PrepareDC(dc);
 

+    dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));

     dc.Clear();
 
     dc.Clear();
 

-       if (GetDiagram())
-               GetDiagram()->Redraw(dc);
+    if (GetDiagram())
+        GetDiagram()->Redraw(dc);

 }
 
 void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
 }
 
 void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)


@@ -398,10 +393,10 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
   //     the other objects
   // (b) to find the control points FIRST if they exist
 
   //     the other objects
   // (b) to find the control points FIRST if they exist
 

-  wxNode *current = GetDiagram()->GetShapeList()->Last();
+  wxNode *current = GetDiagram()->GetShapeList()->GetLast();

   while (current)
   {
   while (current)
   {

-    wxShape *object = (wxShape *)current->Data();
+    wxShape *object = (wxShape *)current->GetData();

 
     double dist;
     int temp_attachment;
 
     double dist;
     int temp_attachment;


@@ -431,13 +426,13 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
       }
     }
     if (current)
       }
     }
     if (current)

-      current = current->Previous();
+      current = current->GetPrevious();

   }
 
   }
 

-  current = GetDiagram()->GetShapeList()->Last();
+  current = GetDiagram()->GetShapeList()->GetLast();

   while (current)
   {
   while (current)
   {

-    wxShape *object = (wxShape *)current->Data();
+    wxShape *object = (wxShape *)current->GetData();

     double dist;
     int temp_attachment;
 
     double dist;
     int temp_attachment;
 


@@ -454,7 +449,6 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
         // Check for division in case line straddles divisions (i.e. is not wholly contained).
         if (!nearest_object || !(object->IsKindOf(CLASSINFO(wxDivisionShape)) || WhollyContains(object, nearest_object)))
         {
         // Check for division in case line straddles divisions (i.e. is not wholly contained).
         if (!nearest_object || !(object->IsKindOf(CLASSINFO(wxDivisionShape)) || WhollyContains(object, nearest_object)))
         {

-          nearest = dist;

           nearest_object = object;
           nearest_attachment = temp_attachment;
           current = NULL;
           nearest_object = object;
           nearest_attachment = temp_attachment;
           current = NULL;


@@ -462,7 +456,7 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
       }
     }
     if (current)
       }
     }
     if (current)

-      current = current->Previous();
+      current = current->GetPrevious();

   }
 
   *attachment = nearest_attachment;
   }
 
   *attachment = nearest_attachment;


@@ -474,35 +468,35 @@ wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassIn
  *
  */
 
  *
  */
 

-void wxShapeCanvas::OnLeftClick(double x, double y, int keys)
+void wxShapeCanvas::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnRightClick(double x, double y, int keys)
+void wxShapeCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnDragLeft(bool draw, double x, double y, int keys)
+void wxShapeCanvas::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnBeginDragLeft(double x, double y, int keys)
+void wxShapeCanvas::OnBeginDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnEndDragLeft(double x, double y, int keys)
+void wxShapeCanvas::OnEndDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnDragRight(bool draw, double x, double y, int keys)
+void wxShapeCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnBeginDragRight(double x, double y, int keys)
+void wxShapeCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }
 

-void wxShapeCanvas::OnEndDragRight(double x, double y, int keys)
+void wxShapeCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))

 {
 }
 
 {
 }