A little black magic... When the C++ object (for a window or

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

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 23bc9b7eb5f37fb544eef0aff63676c74685d8ca..ae41ff83cf0153ce29bac6f1df42d159615844bd 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -33,7 +33,7 @@
 
 #include "wxpoem.h"
 
 
 #include "wxpoem.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

 #include "corner1.xpm"
 #include "corner2.xpm"
 #include "corner3.xpm"
 #include "corner1.xpm"
 #include "corner2.xpm"
 #include "corner3.xpm"


@@ -650,7 +650,7 @@ bool MyApp::OnInit()
   Corner3 = new wxIcon("icon_3");
   Corner4 = new wxIcon("icon_4");
 #endif
   Corner3 = new wxIcon("icon_3");
   Corner4 = new wxIcon("icon_4");
 #endif

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

   Corner1 = new wxIcon( corner1_xpm );
   Corner2 = new wxIcon( corner2_xpm );
   Corner3 = new wxIcon( corner3_xpm );
   Corner1 = new wxIcon( corner1_xpm );
   Corner2 = new wxIcon( corner2_xpm );
   Corner3 = new wxIcon( corner3_xpm );


@@ -680,9 +680,13 @@ int MyApp::OnExit()
   delete Corner3;
   delete Corner4;
 
   delete Corner3;
   delete Corner4;
 

+  // Causes crash since they're deleted by the global font list
+#if 0

   delete NormalFont;
   delete BoldFont;
   delete ItalicFont;
   delete NormalFont;
   delete BoldFont;
   delete ItalicFont;

+#endif
+

   delete[] poem_buffer;
   if (search_string)
     delete[] search_string;
   delete[] poem_buffer;
   if (search_string)
     delete[] search_string;


@@ -723,9 +727,12 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
         int xx, yy;
         TheMainWindow->GetClientSize(&xx, &yy);
 
         int xx, yy;
         TheMainWindow->GetClientSize(&xx, &yy);
 

+        dc.DrawBitmap(* backingBitmap, 0, 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);

+#endif

   }
 }
 
   }
 }