don't crash in GetTextExtent() under Windows where print data is not a wxPostScriptPr...

[wxWidgets.git] / samples / richedit / kbList.cpp

diff --git a/samples/richedit/kbList.cpp b/samples/richedit/kbList.cpp
index a5798fc6cca0d9549bcddfea8474deaf5509517f..8d6d0327495b001dbdbc6ac41145495ffa2ee28d 100644 (file)
--- a/samples/richedit/kbList.cpp
+++ b/samples/richedit/kbList.cpp
@@ -6,6 +6,16 @@
  * $Id$          *
  *                                                                  *
  * $Log$
  * $Id$          *
  *                                                                  *
  * $Log$

+ * Revision 1.4  2005/05/31 09:19:38  JS
+ * Typo correction patch [ 1208110 ] Lots of typo corrections
+ * Olly Betts
+ *
+ * Revision 1.3  2004/08/06 17:27:18  ABX
+ * Deleting void is undefined.
+ *
+ * Revision 1.2  2002/01/16 13:39:50  GT
+ * Added checks for wxUSE_IOSTREAMH to determine which iostream(.h) to use
+ *

  * Revision 1.1  1999/06/07 09:57:12  KB
  * Formerly known as wxLayout.
  *
  * Revision 1.1  1999/06/07 09:57:12  KB
  * Formerly known as wxLayout.
  *


@@ -21,7 +31,7 @@
  *    always failed, must mkdir("~/.M") first)
  * 2) "redesign" of "Folder properties" dialog and bug corrected, small change to
  *    MInputBox (it was too wide)
  *    always failed, must mkdir("~/.M") first)
  * 2) "redesign" of "Folder properties" dialog and bug corrected, small change to
  *    MInputBox (it was too wide)

- * 3) bug in ProvFC when it didn't reckognize the books as being in the correct
+ * 3) bug in ProvFC when it didn't recognize the books as being in the correct

  *    format (=> messages "can't reopen book") corrected
  * 4) I tried to enhance MDialog_About(), but it didn't really work... oh well,
  *    I've never said I was an artist
  *    format (=> messages "can't reopen book") corrected
  * 4) I tried to enhance MDialog_About(), but it didn't really work... oh well,
  *    I've never said I was an artist


@@ -56,6 +66,14 @@
 #   pragma implementation "kbList.h"
 #endif
 
 #   pragma implementation "kbList.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#  pragma hdrstop
+#endif
+
+#include   "wx/wx.h"
+

 #include   "kbList.h"
 
 
 #include   "kbList.h"
 
 


@@ -249,7 +267,14 @@ kbList::~kbList()
    {
       next = first->next;
       if(ownsEntries)
    {
       next = first->next;
       if(ownsEntries)

+      {
+#if 0

          delete first->element;
          delete first->element;

+#else
+         wxLogError(wxT("Deleting `void*' is undefined."));
+         wxLogError(wxT("Entries of kbList should be deleted by destructors of derived classes."));
+#endif
+      }

       delete first;
       first = next;
    }
       delete first;
       first = next;
    }


@@ -291,7 +316,11 @@ kbList::size(void) const // inefficient
 
 #ifdef   KBLIST_TEST
 
 
 #ifdef   KBLIST_TEST
 

-#include   <iostream.h>
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif

 
 KBLIST_DEFINE(kbListInt,int);
    
 
 KBLIST_DEFINE(kbListInt,int);