This should work on SuSE and Mandrake icon themes.

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

diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
index cd4cfb0339c1733389f5b35ef7ebd7c02940cf8d..0b773e393ed07646a948aacc8c911f1c26b1b0f6 100644 (file)
--- a/contrib/src/ogl/oglmisc.cpp
+++ b/contrib/src/ogl/oglmisc.cpp
@@ -49,7 +49,7 @@ wxBrush*        g_oglWhiteBackgroundBrush;
 wxPen*          g_oglBlackForegroundPen;
 wxCursor*       g_oglBullseyeCursor = NULL;
 
-char*           oglBuffer = NULL;
+wxChar*           oglBuffer = NULL;
 
 wxList          oglObjectCopyMapping(wxKEY_INTEGER);
 
@@ -71,7 +71,7 @@ void wxOGLInitialize()
   OGLInitializeConstraintTypes();
 
   // Initialize big buffer used when writing images
-  oglBuffer = new char[3000];
+  oglBuffer = new wxChar[3000];
 
 }
 
@@ -360,7 +360,6 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
   long current_width = 0;
 
   wxNode *current = text_list->GetFirst();
-  int i = 0;
   while (current)
   {
     wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
@@ -369,7 +368,6 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
     if (current_width > max_width)
       max_width = current_width;
     current = current->GetNext();
-    i ++;
   }
 
   *actual_height = n*char_height;
@@ -413,6 +411,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
       case 13:
       {
         new_line = TRUE; end_word = TRUE; i++;
+        break;
       }
       case wxT(' '):
       {