Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 2a2d89c03166c89552208c26e779dd7e2b505147..3866bdef482e6a015f79334fbd9e5ce574ca2732 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__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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


@@ -236,7 +236,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
     while (ch != 0 && !page_break)
     {
         j = 0;
     while (ch != 0 && !page_break)
     {
         j = 0;

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

         while (((ch = poem_buffer[i]) != 13) && (ch != 0))
 #else
         while (((ch = poem_buffer[i]) != 10) && (ch != 0))
         while (((ch = poem_buffer[i]) != 13) && (ch != 0))
 #else
         while (((ch = poem_buffer[i]) != 10) && (ch != 0))


@@ -247,7 +247,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
             i ++;
         }
 
             i ++;
         }
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

         if (ch == 13)
 #else
         if (ch == 10)
         if (ch == 13)
 #else
         if (ch == 10)


@@ -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__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

   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,10 +680,16 @@ 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;

-  delete poem_buffer;
+#endif
+
+  delete[] poem_buffer;
+  if (search_string)
+    delete[] search_string;

 
   return 0;
 }
 
   return 0;
 }


@@ -993,7 +999,7 @@ long MainWindow::DoSearch(void)
 // Load index (or compile it if none found)
 void TryLoadIndex()
 {
 // Load index (or compile it if none found)
 void TryLoadIndex()
 {

-  index_ok = LoadIndex(index_filename);
+  index_ok = (LoadIndex(index_filename) != 0);

   if (!index_ok || (nitems == 0))
   {
       PoetryError("Index file not found; will compile new one", "wxPoem");
   if (!index_ok || (nitems == 0))
   {
       PoetryError("Index file not found; will compile new one", "wxPoem");