removed ambiguity from wxGLCanvas ctors (bug 1102544)

[wxWidgets.git] / demos / poem / wxpoem.cpp

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index e426da666e1b06b1c13978faff9af058e6ab4186..24dabe56b7596118aabb6da51393155677318e83 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -220,7 +220,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
         while (((ch = poem_buffer[i]) != 10) && (ch != 0))
 #endif
         {
         while (((ch = poem_buffer[i]) != 10) && (ch != 0))
 #endif
         {

-            line[j] = ch;
+            line[j] = (wxChar)ch;

             j ++;
             i ++;
         }
             j ++;
             i ++;
         }


@@ -661,7 +661,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
         TheMainWindow->GetClientSize(&xx, &yy);
 
         dc.DrawBitmap(* backingBitmap, 0, 0);
         TheMainWindow->GetClientSize(&xx, &yy);
 
         dc.DrawBitmap(* backingBitmap, 0, 0);

-#if 0        
+#if 0

         wxMemoryDC memDC;
         memDC.SelectObject(* backingBitmap);
         dc.Blit(0, 0, backingBitmap->GetWidth(), backingBitmap->GetHeight(), &memDC, 0, 0);
         wxMemoryDC memDC;
         memDC.SelectObject(* backingBitmap);
         dc.Blit(0, 0, backingBitmap->GetWidth(), backingBitmap->GetHeight(), &memDC, 0, 0);


@@ -748,7 +748,7 @@ int LoadIndex(wxChar *file_name)
 
     wxSprintf(buf, _T("%s.idx"), file_name);
 
 
     wxSprintf(buf, _T("%s.idx"), file_name);
 

-    index_file = wxFopen(buf, _T("r"));
+    index_file = wxFopen(wxFNCONV(buf), _T("r"));

     if (index_file == NULL)
       return 0;
 
     if (index_file == NULL)
       return 0;
 


@@ -823,7 +823,7 @@ bool LoadPoem(wxChar *file_name, long position)
     }
 
     wxSprintf(buf, _T("%s.dat"), file_name);
     }
 
     wxSprintf(buf, _T("%s.dat"), file_name);

-    data_file = wxFopen(buf, _T("r"));
+    data_file = wxFopen(wxFNCONV(buf), _T("r"));

 
     if (data_file == NULL)
     {
 
     if (data_file == NULL)
     {


@@ -851,7 +851,7 @@ bool LoadPoem(wxChar *file_name, long position)
           i++;
         }
 
           i++;
         }
 

-        poem_buffer[i] = ch;
+        poem_buffer[i] = (wxChar)ch;

         i ++;
 
         if (i == buf_size)
         i ++;
 
         if (i == buf_size)


@@ -897,7 +897,7 @@ long MainWindow::DoSearch(void)
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 

-    file = wxFopen(buf, _T("r"));
+    file = wxFopen(wxFNCONV(buf), _T("r"));

     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);
     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);


@@ -979,7 +979,7 @@ bool Compile(void)
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 

-    file = wxFopen(buf, _T("r"));
+    file = wxFopen(wxFNCONV(buf), _T("r"));

     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);
     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);


@@ -994,7 +994,7 @@ bool Compile(void)
     nitems ++;
 
     // Do rest
     nitems ++;
 
     // Do rest

-    
+

     do {
         ch = getc(file);
         if (ch == '#')
     do {
         ch = getc(file);
         if (ch == '#')


@@ -1011,7 +1011,7 @@ bool Compile(void)
     if (index_filename)
       wxSprintf(buf, _T("%s.idx"), index_filename);
 
     if (index_filename)
       wxSprintf(buf, _T("%s.idx"), index_filename);
 

-    file = wxFopen(buf, _T("w"));
+    file = wxFopen(wxFNCONV(buf), _T("w"));

     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry index file %s cannot be created\n"), buf);
     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry index file %s cannot be created\n"), buf);