compilation fix for gcc (closes bug 996701)

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

diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
index 7de32c2c77a080509adc54d494e123ecdb7c8fe2..9b575499d59ec7377f5fc883e2011309dbc04b4b 100644 (file)
--- a/contrib/src/ogl/oglmisc.cpp
+++ b/contrib/src/ogl/oglmisc.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -49,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);
 


@@ -71,7 +71,7 @@ void wxOGLInitialize()
   OGLInitializeConstraintTypes();
 
   // Initialize big buffer used when writing images
   OGLInitializeConstraintTypes();
 
   // Initialize big buffer used when writing images

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

 
 }
 
 
 }
 


@@ -83,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;


@@ -340,7 +341,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
 }
 
 void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
 }
 
 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)
 {
   int n = text_list->GetCount();
                               double *actual_width, double *actual_height)
 {
   int n = text_list->GetCount();


@@ -359,7 +360,6 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
   long current_width = 0;
 
   wxNode *current = text_list->GetFirst();
   long current_width = 0;
 
   wxNode *current = text_list->GetFirst();

-  int i = 0;

   while (current)
   {
     wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
   while (current)
   {
     wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();


@@ -368,7 +368,6 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
     if (current_width > max_width)
       max_width = current_width;
     current = current->GetNext();
     if (current_width > max_width)
       max_width = current_width;
     current = current->GetNext();

-    i ++;

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


@@ -377,7 +376,7 @@ 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;
 {
   // First, parse the string into a list of words
   wxStringList word_list;


@@ -385,7 +384,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
   // Make new lines into NULL strings at this point
   int i = 0; int j = 0; int len = text.Length();
   wxChar word[200]; word[0] = 0;
   // Make new lines into NULL strings at this point
   int i = 0; int j = 0; int len = text.Length();
   wxChar word[200]; word[0] = 0;

-  bool end_word = FALSE; bool new_line = FALSE;
+  bool end_word = false; bool new_line = false;

   while (i < len)
   {
     switch (text[i])
   while (i < len)
   {
     switch (text[i])


@@ -398,7 +397,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
         else
         {
           if (text[i] == wxT('n'))
         else
         {
           if (text[i] == wxT('n'))

-          { new_line = TRUE; end_word = TRUE; i++; }
+          { new_line = true; end_word = true; i++; }

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


@@ -406,16 +405,17 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
       }
       case 10:
       {
       }
       case 10:
       {

-        new_line = TRUE; end_word = TRUE; i++;
+        new_line = true; end_word = true; i++;

         break;
       }
       case 13:
       {
         break;
       }
       case 13:
       {

-        new_line = TRUE; end_word = TRUE; i++;
+        new_line = true; end_word = true; i++;
+        break;

       }
       case wxT(' '):
       {
       }
       case wxT(' '):
       {

-        end_word = TRUE;
+        end_word = true;

         i ++;
         break;
       }
         i ++;
         break;
       }


@@ -426,18 +426,18 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
         break;
       }
     }
         break;
       }
     }

-    if (i == len) end_word = TRUE;
+    if (i == len) end_word = true;

     if (end_word)
     {
       word[j] = 0;
       j = 0;
       word_list.Add(word);
     if (end_word)
     {
       word[j] = 0;
       j = 0;
       word_list.Add(word);

-      end_word = FALSE;
+      end_word = false;

     }
     if (new_line)
     {
       word_list.Append(NULL);
     }
     if (new_line)
     {
       word_list.Append(NULL);

-      new_line = FALSE;
+      new_line = false;

     }
   }
   // Now, make a list of strings which can fit in the box
     }
   }
   // Now, make a list of strings which can fit in the box


@@ -505,7 +505,7 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
 
   dc.SetClippingRegion(
                     (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
 
   dc.SetClippingRegion(
                     (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),

-                    (long)width, (long)height);
+                    (long)width+1, (long)height+1); // +1 to allow for rounding errors

 
   wxNode *current = text_list->GetFirst();
   while (current)
 
   wxNode *current = text_list->GetFirst();
   while (current)