removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor

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

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 8a883d1543c553377899174921399a0418f45799..09e02e276965d56adf8e10b91bc82acd5850deea 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -206,7 +206,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
     dc->SetFont(* NormalFont);
     long xx;
     long yy;
     dc->SetFont(* NormalFont);
     long xx;
     long yy;

-    dc->GetTextExtent("X", &xx, &yy);
+    dc->GetTextExtent(_T("X"), &xx, &yy);

     char_height = (int)yy;
 
     if (current_page == 0)
     char_height = (int)yy;
 
     if (current_page == 0)


@@ -844,9 +844,13 @@ int GetIndex()
 // Read preferences
 void ReadPreferences()
 {
 // Read preferences
 void ReadPreferences()
 {

+#if wxUSE_RESOURCES
+#if wxUSE_RESOURCES

   wxGetResource("wxPoem", "FontSize", &pointSize);
   wxGetResource("wxPoem", "X", &XPos);
   wxGetResource("wxPoem", "Y", &YPos);
   wxGetResource("wxPoem", "FontSize", &pointSize);
   wxGetResource("wxPoem", "X", &XPos);
   wxGetResource("wxPoem", "Y", &YPos);

+#endif
+#endif

 }
 
 // Write preferences to disk
 }
 
 // Write preferences to disk


@@ -854,10 +858,14 @@ void WritePreferences()
 {
 #ifdef __WXMSW__
   TheMainWindow->GetPosition(&XPos, &YPos);
 {
 #ifdef __WXMSW__
   TheMainWindow->GetPosition(&XPos, &YPos);

+#if wxUSE_RESOURCES
+#if wxUSE_RESOURCES

   wxWriteResource("wxPoem", "FontSize", pointSize);
   wxWriteResource("wxPoem", "X", XPos);
   wxWriteResource("wxPoem", "Y", YPos);
 #endif
   wxWriteResource("wxPoem", "FontSize", pointSize);
   wxWriteResource("wxPoem", "X", XPos);
   wxWriteResource("wxPoem", "Y", YPos);
 #endif

+#endif
+#endif

 }
 
 // Load a poem from given file, at given point in file.
 }
 
 // Load a poem from given file, at given point in file.