Some OGl updates:

[wxWidgets.git] / utils / ogl / src / misc.cpp

diff --git a/utils/ogl/src/misc.cpp b/utils/ogl/src/misc.cpp
index 4d9d814d2414d2ba9e4effeebfe58c4378bf116e..50ed2669dc20e55544cb9d73927425954d0a6d73 100644 (file)
--- a/utils/ogl/src/misc.cpp
+++ b/utils/ogl/src/misc.cpp
@@ -24,9 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#ifdef PROLOGIO
 #include <wx/wxexpr.h>
-#endif
 
 #include <wx/types.h>
 
@@ -446,12 +444,12 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
     {
       word[j] = 0;
       j = 0;
-      word_list.Append((wxObject *)copystring(word));
+      word_list.Add(word);
       end_word = FALSE;
     }
     if (new_line)
     {
-      word_list.Append((wxObject *)NULL);
+      word_list.Append(NULL);
       new_line = FALSE;
     }
   }
@@ -520,8 +518,8 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
     yoffset = (double)(m_ypos - (height / 2.0));
 
   dc.SetClippingRegion(
-                    (double)(m_xpos - width/2.0), (double)(m_ypos - height/2.0),
-                    (double)width, (double)height);
+                    (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
+                    (long)width, (long)height);
 
   wxNode *current = text_list->First();
   while (current)