fix for assert when setting tooltip for a readonly combo

[wxWidgets.git] / src / html / htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 82f3e09fceaa95759d6423745dce99dde4fa6935..df55a076eb970e07d5b16653713fcf3398817e3b 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -485,16 +485,14 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
         delete preview;
         return FALSE;
     }
-    
-    else {
-        wxPreviewFrame *frame = new wxPreviewFrame(preview, m_Frame, 
-                                                   m_Name + _(" Preview"), 
-                                                   wxPoint(100, 100), wxSize(650, 500));
-        frame -> Centre(wxBOTH);
-        frame -> Initialize();
-        frame -> Show(TRUE);
-        return TRUE;
-    }
+
+    wxPreviewFrame *frame = new wxPreviewFrame(preview, m_Frame, 
+                                               m_Name + _(" Preview"), 
+                                               wxPoint(100, 100), wxSize(650, 500));
+    frame -> Centre(wxBOTH);
+    frame -> Initialize();
+    frame -> Show(TRUE);
+    return TRUE;
 }
 
 
@@ -508,11 +506,9 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
     {
         return FALSE;
     }
-    else
-    {
-        (*m_PrintData) = printer.GetPrintDialogData().GetPrintData();
-        return TRUE;
-    }
+
+    (*m_PrintData) = printer.GetPrintDialogData().GetPrintData();
+    return TRUE;
 }