Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

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

diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
index 30deb1d87bc2eb9df7742840fc682f87177aacfb..b0fdf825f7b51b165f469c37223157fff8f7f0cb 100644 (file)
--- a/contrib/src/ogl/oglmisc.cpp
+++ b/contrib/src/ogl/oglmisc.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

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

 
 #include <wx/types.h>
 
 
 #include <wx/types.h>
 


@@ -36,11 +38,8 @@
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>
 

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

 
 wxFont*         g_oglNormalFont;
 wxPen*          g_oglBlackPen;
 
 wxFont*         g_oglNormalFont;
 wxPen*          g_oglBlackPen;


@@ -50,7 +49,7 @@ wxBrush*        g_oglWhiteBackgroundBrush;
 wxPen*          g_oglBlackForegroundPen;
 wxCursor*       g_oglBullseyeCursor = NULL;
 
 wxPen*          g_oglBlackForegroundPen;
 wxCursor*       g_oglBullseyeCursor = NULL;
 

-char*           oglBuffer = NULL;
+wxChar*           oglBuffer = NULL;

 
 wxList          oglObjectCopyMapping(wxKEY_INTEGER);
 
 
 wxList          oglObjectCopyMapping(wxKEY_INTEGER);
 


@@ -62,17 +61,17 @@ void wxOGLInitialize()
 
   g_oglNormalFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
 
 
   g_oglNormalFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
 

-  g_oglBlackPen = new wxPen("BLACK", 1, wxSOLID);
+  g_oglBlackPen = new wxPen(wxT("BLACK"), 1, wxSOLID);

 
 

-  g_oglWhiteBackgroundPen = new wxPen("WHITE", 1, wxSOLID);
-  g_oglTransparentPen = new wxPen("WHITE", 1, wxTRANSPARENT);
-  g_oglWhiteBackgroundBrush = new wxBrush("WHITE", wxSOLID);
-  g_oglBlackForegroundPen = new wxPen("BLACK", 1, wxSOLID);
+  g_oglWhiteBackgroundPen = new wxPen(wxT("WHITE"), 1, wxSOLID);
+  g_oglTransparentPen = new wxPen(wxT("WHITE"), 1, wxTRANSPARENT);
+  g_oglWhiteBackgroundBrush = new wxBrush(wxT("WHITE"), wxSOLID);
+  g_oglBlackForegroundPen = new wxPen(wxT("BLACK"), 1, wxSOLID);

 
   OGLInitializeConstraintTypes();
 
   // Initialize big buffer used when writing images
 
   OGLInitializeConstraintTypes();
 
   // Initialize big buffer used when writing images

-  oglBuffer = new char[3000];
+  oglBuffer = new wxChar[3000];

 
 }
 
 
 }
 


@@ -84,6 +83,7 @@ void wxOGLCleanUp()
         oglBuffer = NULL;
     }
     oglBuffer = NULL;
         oglBuffer = NULL;
     }
     oglBuffer = NULL;

+

     if (g_oglBullseyeCursor)
     {
         delete g_oglBullseyeCursor;
     if (g_oglBullseyeCursor)
     {
         delete g_oglBullseyeCursor;


@@ -164,16 +164,17 @@ int FontSizeDialog(wxFrame *parent, int old_size)
 {
   if (old_size <= 0)
     old_size = 10;
 {
   if (old_size <= 0)
     old_size = 10;

-  char buf[40];
-  sprintf(buf, "%d", old_size);
-  wxString ans = wxGetTextFromUser("Enter point size", "Font size", buf, parent);
-  if (ans == "")
+  wxString buf;
+  buf << old_size;
+  wxString ans = wxGetTextFromUser(wxT("Enter point size"), wxT("Font size"), buf, parent);
+  if (ans.Length() == 0)

     return 0;
 
     return 0;
 

-  int new_size = atoi(ans);
+  long new_size = 0;
+  ans.ToLong(&new_size);

   if ((new_size <= 0) || (new_size > 40))
   {
   if ((new_size <= 0) || (new_size > 40))
   {

-    wxMessageBox("Invalid point size!", "Error", wxOK);
+    wxMessageBox(wxT("Invalid point size!"), wxT("Error"), wxOK);

     return 0;
   }
   return new_size;
     return 0;
   }
   return new_size;


@@ -205,7 +206,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
                 double m_xpos, double m_ypos, double width, double height,
                 int formatMode)
 {
                 double m_xpos, double m_ypos, double width, double height,
                 int formatMode)
 {

-  int n = text_list->Number();
+  int n = text_list->GetCount();

 
   if (!text_list || (n == 0))
     return;
 
   if (!text_list || (n == 0))
     return;


@@ -219,17 +220,17 @@ void oglCentreText(wxDC& dc, wxList *text_list,
   // Store text extents for speed
   double *widths = new double[n];
 
   // Store text extents for speed
   double *widths = new double[n];
 

-  wxNode *current = text_list->First();
+  wxNode *current = text_list->GetFirst();

   int i = 0;
   while (current)
   {
   int i = 0;
   while (current)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)current->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();

     dc.GetTextExtent(line->GetText(), &current_width, &char_height);
     widths[i] = current_width;
 
     if (current_width > max_width)
       max_width = current_width;
     dc.GetTextExtent(line->GetText(), &current_width, &char_height);
     widths[i] = current_width;
 
     if (current_width > max_width)
       max_width = current_width;

-    current = current->Next();
+    current = current->GetNext();

     i ++;
   }
 
     i ++;
   }
 


@@ -262,12 +263,12 @@ void oglCentreText(wxDC& dc, wxList *text_list,
     xOffset = 0.0;
   }
 
     xOffset = 0.0;
   }
 

-  current = text_list->First();
+  current = text_list->GetFirst();

   i = 0;
 
   while (current)
   {
   i = 0;
 
   while (current)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)current->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();

 
     double x;
     if ((formatMode & FORMAT_CENTRE_HORIZ) && (widths[i] < width))
 
     double x;
     if ((formatMode & FORMAT_CENTRE_HORIZ) && (widths[i] < width))


@@ -277,7 +278,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
     double y = (double)(i*char_height + yoffset);
 
     line->SetX( x - xOffset ); line->SetY( y - yOffset );
     double y = (double)(i*char_height + yoffset);
 
     line->SetX( x - xOffset ); line->SetY( y - yOffset );

-    current = current->Next();
+    current = current->GetNext();

     i ++;
   }
 
     i ++;
   }
 


@@ -288,7 +289,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
 void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
                               double m_xpos, double m_ypos, double width, double height)
 {
 void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
                               double m_xpos, double m_ypos, double width, double height)
 {

-  int n = text_list->Number();
+  int n = text_list->GetCount();

 
   if (!text_list || (n == 0))
     return;
 
   if (!text_list || (n == 0))
     return;


@@ -302,17 +303,17 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
   // Store text extents for speed
   double *widths = new double[n];
 
   // Store text extents for speed
   double *widths = new double[n];
 

-  wxNode *current = text_list->First();
+  wxNode *current = text_list->GetFirst();

   int i = 0;
   while (current)
   {
   int i = 0;
   while (current)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)current->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();

     dc.GetTextExtent(line->GetText(), &current_width, &char_height);
     widths[i] = current_width;
 
     if (current_width > max_width)
       max_width = current_width;
     dc.GetTextExtent(line->GetText(), &current_width, &char_height);
     widths[i] = current_width;
 
     if (current_width > max_width)
       max_width = current_width;

-    current = current->Next();
+    current = current->GetNext();

     i ++;
   }
 
     i ++;
   }
 


@@ -322,28 +323,28 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
 
   double xoffset = (double)(m_xpos - width/2.0);
 
 
   double xoffset = (double)(m_xpos - width/2.0);
 

-  current = text_list->First();
+  current = text_list->GetFirst();

   i = 0;
 
   while (current)
   {
   i = 0;
 
   while (current)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)current->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();

 
     double x = (double)((width - widths[i])/2.0 + xoffset);
     double y = (double)(i*char_height + yoffset);
 
     line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
 
     double x = (double)((width - widths[i])/2.0 + xoffset);
     double y = (double)(i*char_height + yoffset);
 
     line->SetX( x - m_xpos ); line->SetY( y - m_ypos );

-    current = current->Next();
+    current = current->GetNext();

     i ++;
   }
   delete widths;
 }
 
 void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
     i ++;
   }
   delete widths;
 }
 
 void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,

-                              double m_xpos, double m_ypos, double width, double height,
+                              double WXUNUSED(m_xpos), double WXUNUSED(m_ypos), double WXUNUSED(width), double WXUNUSED(height),

                               double *actual_width, double *actual_height)
 {
                               double *actual_width, double *actual_height)
 {

-  int n = text_list->Number();
+  int n = text_list->GetCount();

 
   if (!text_list || (n == 0))
   {
 
   if (!text_list || (n == 0))
   {


@@ -358,17 +359,15 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
   long max_width = 0;
   long current_width = 0;
 
   long max_width = 0;
   long current_width = 0;
 

-  wxNode *current = text_list->First();
-  int i = 0;
+  wxNode *current = text_list->GetFirst();

   while (current)
   {
   while (current)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)current->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();

     dc.GetTextExtent(line->GetText(), &current_width, &char_height);
 
     if (current_width > max_width)
       max_width = current_width;
     dc.GetTextExtent(line->GetText(), &current_width, &char_height);
 
     if (current_width > max_width)
       max_width = current_width;

-    current = current->Next();
-    i ++;
+    current = current->GetNext();

   }
 
   *actual_height = n*char_height;
   }
 
   *actual_height = n*char_height;


@@ -377,30 +376,30 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
 
 // Format a string to a list of strings that fit in the given box.
 // Interpret %n and 10 or 13 as a new line.
 
 // Format a string to a list of strings that fit in the given box.
 // Interpret %n and 10 or 13 as a new line.

-wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double height, int formatMode)
+wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double WXUNUSED(height), int formatMode)

 {
   // First, parse the string into a list of words
   wxStringList word_list;
 
   // Make new lines into NULL strings at this point
 {
   // First, parse the string into a list of words
   wxStringList word_list;
 
   // Make new lines into NULL strings at this point

-  int i = 0; int j = 0; int len = strlen(text);
-  char word[200]; word[0] = 0;
+  int i = 0; int j = 0; int len = text.Length();
+  wxChar word[200]; word[0] = 0;

   bool end_word = FALSE; bool new_line = FALSE;
   while (i < len)
   {
     switch (text[i])
     {
   bool end_word = FALSE; bool new_line = FALSE;
   while (i < len)
   {
     switch (text[i])
     {

-      case '%':
+      case wxT('%'):

       {
         i ++;
         if (i == len)
       {
         i ++;
         if (i == len)

-        { word[j] = '%'; j ++; }
+        { word[j] = wxT('%'); j ++; }

         else
         {
         else
         {

-          if (text[i] == 'n')
+          if (text[i] == wxT('n'))

           { new_line = TRUE; end_word = TRUE; i++; }
           else
           { new_line = TRUE; end_word = TRUE; i++; }
           else

-          { word[j] = '%'; j ++; word[j] = text[i]; j ++; i ++; }
+          { word[j] = wxT('%'); j ++; word[j] = text[i]; j ++; i ++; }

         }
         break;
       }
         }
         break;
       }


@@ -413,7 +412,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
       {
         new_line = TRUE; end_word = TRUE; i++;
       }
       {
         new_line = TRUE; end_word = TRUE; i++;
       }

-      case ' ':
+      case wxT(' '):

       {
         end_word = TRUE;
         i ++;
       {
         end_word = TRUE;
         i ++;


@@ -443,30 +442,29 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
   // Now, make a list of strings which can fit in the box
   wxStringList *string_list = new wxStringList;
 
   // Now, make a list of strings which can fit in the box
   wxStringList *string_list = new wxStringList;
 

-  char buffer[400];
-  buffer[0] = 0;
-  wxNode *node = word_list.First();
+  wxString buffer;
+  wxStringListNode *node = word_list.GetFirst();

   long x, y;
 
   while (node)
   {
     wxString oldBuffer(buffer);
 
   long x, y;
 
   while (node)
   {
     wxString oldBuffer(buffer);
 

-    char *s = (char *)node->Data();
+    wxChar *s = (wxChar *)node->GetData();

     if (!s)
     {
       // FORCE NEW LINE
     if (!s)
     {
       // FORCE NEW LINE

-      if (strlen(buffer) > 0)
+      if (buffer.Length() > 0)

         string_list->Add(buffer);
 
         string_list->Add(buffer);
 

-      buffer[0] = 0;
+      buffer.Empty();

     }
     else
     {
     }
     else
     {

-      if (buffer[0] != 0)
-        strcat(buffer, " ");
+      if (buffer.Length() != 0)
+        buffer += wxT(" ");

 
 

-      strcat(buffer, s);
+      buffer += s;

       dc.GetTextExtent(buffer, &x, &y);
 
       // Don't fit within the bounding box if we're fitting shape to contents
       dc.GetTextExtent(buffer, &x, &y);
 
       // Don't fit within the bounding box if we're fitting shape to contents


@@ -476,14 +474,14 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
         if (oldBuffer.Length() > 0)
           string_list->Add(oldBuffer);
 
         if (oldBuffer.Length() > 0)
           string_list->Add(oldBuffer);
 

-        buffer[0] = 0;
-        strcat(buffer, s);
+        buffer.Empty();
+        buffer += s;

       }
     }
 
       }
     }
 

-    node = node->Next();
+    node = node->GetNext();

   }
   }

-  if (buffer[0] != 0)
+  if (buffer.Length() != 0)

     string_list->Add(buffer);
 
   return string_list;
     string_list->Add(buffer);
 
   return string_list;


@@ -508,13 +506,13 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
                     (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
                     (long)width, (long)height);
 
                     (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
                     (long)width, (long)height);
 

-  wxNode *current = text_list->First();
+  wxNode *current = text_list->GetFirst();

   while (current)
   {
   while (current)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)current->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();

 
     dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
 
     dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));

-    current = current->Next();
+    current = current->GetNext();

   }
 
   dc.DestroyClippingRegion();
   }
 
   dc.DestroyClippingRegion();


@@ -530,17 +528,17 @@ void oglFindPolylineCentroid(wxList *points, double *x, double *y)
   double xcount = 0;
   double ycount = 0;
 
   double xcount = 0;
   double ycount = 0;
 

-  wxNode *node = points->First();
+  wxNode *node = points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     xcount += point->x;
     ycount += point->y;
     xcount += point->x;
     ycount += point->y;

-    node = node->Next();
+    node = node->GetNext();

   }
 
   }
 

-  *x = (xcount/points->Number());
-  *y = (ycount/points->Number());
+  *x = (xcount/points->GetCount());
+  *y = (ycount/points->GetCount());

 }
 
 /*
 }
 
 /*


@@ -808,12 +806,12 @@ void UpdateListBox(wxListBox *item, wxList *list)
   if (!list)
     return;
 
   if (!list)
     return;
 

-  wxNode *node = list->First();
+  wxNode *node = list->GetFirst();

   while (node)
   {
   while (node)
   {

-    char *s = (char *)node->Data();
+    wxChar *s = (wxChar *)node->GetData();

     item->Append(s);
     item->Append(s);

-    node = node->Next();
+    node = node->GetNext();

   }
 }
 
   }
 }
 


@@ -828,29 +826,32 @@ bool oglRoughlyEqual(double val1, double val2, double tol)
  */
 
 // Array used in DecToHex conversion routine.
  */
 
 // Array used in DecToHex conversion routine.

-static char sg_HexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
-  'C', 'D', 'E', 'F' };
+static wxChar sg_HexArray[] = { wxT('0'), wxT('1'), wxT('2'), wxT('3'),
+                                wxT('4'), wxT('5'), wxT('6'), wxT('7'),
+                                wxT('8'), wxT('9'), wxT('A'), wxT('B'),
+                                wxT('C'), wxT('D'), wxT('E'), wxT('F')
+};

 
 // Convert 2-digit hex number to decimal
 
 // Convert 2-digit hex number to decimal

-unsigned int oglHexToDec(char* buf)
+unsigned int oglHexToDec(wxChar* buf)

 {
   int firstDigit, secondDigit;
 
 {
   int firstDigit, secondDigit;
 

-  if (buf[0] >= 'A')
-    firstDigit = buf[0] - 'A' + 10;
+  if (buf[0] >= wxT('A'))
+    firstDigit = buf[0] - wxT('A') + 10;

   else
   else

-    firstDigit = buf[0] - '0';
+    firstDigit = buf[0] - wxT('0');

 
 

-  if (buf[1] >= 'A')
-    secondDigit = buf[1] - 'A' + 10;
+  if (buf[1] >= wxT('A'))
+    secondDigit = buf[1] - wxT('A') + 10;

   else
   else

-    secondDigit = buf[1] - '0';
+    secondDigit = buf[1] - wxT('0');

 
   return firstDigit * 16 + secondDigit;
 }
 
 // Convert decimal integer to 2-character hex string
 
   return firstDigit * 16 + secondDigit;
 }
 
 // Convert decimal integer to 2-character hex string

-void oglDecToHex(unsigned int dec, char *buf)
+void oglDecToHex(unsigned int dec, wxChar *buf)

 {
     int firstDigit = (int)(dec/16.0);
     int secondDigit = (int)(dec - (firstDigit*16.0));
 {
     int firstDigit = (int)(dec/16.0);
     int secondDigit = (int)(dec - (firstDigit*16.0));


@@ -863,22 +864,22 @@ void oglDecToHex(unsigned int dec, char *buf)
 wxColour oglHexToColour(const wxString& hex)
 {
     if (hex.Length() == 6)
 wxColour oglHexToColour(const wxString& hex)
 {
     if (hex.Length() == 6)

-       {
-        char buf[7];
-        strncpy(buf, hex, 7);
-        unsigned int r = oglHexToDec((char *)buf);
-        unsigned int g = oglHexToDec((char *)(buf+2));
-        unsigned int b = oglHexToDec((char *)(buf+4));
+    {
+        long r, g, b;
+        r = g = b = 0;
+        hex.Mid(0,2).ToLong(&r, 16);
+        hex.Mid(2,2).ToLong(&g, 16);
+        hex.Mid(4,2).ToLong(&b, 16);

         return wxColour(r, g, b);
         return wxColour(r, g, b);

-       }
-       else
-           return wxColour(0,0,0);
+    }
+    else
+        return wxColour(0,0,0);

 }
 
 // RGB to 3-digit hex
 wxString oglColourToHex(const wxColour& colour)
 {
 }
 
 // RGB to 3-digit hex
 wxString oglColourToHex(const wxColour& colour)
 {

-    char buf[7];
+    wxChar buf[7];

     unsigned int red = colour.Red();
     unsigned int green = colour.Green();
     unsigned int blue = colour.Blue();
     unsigned int red = colour.Red();
     unsigned int green = colour.Green();
     unsigned int blue = colour.Blue();