Check the result of ToWChar() call in wxTextInputStream::NextChar() better.

[wxWidgets.git] / src / xrc / xh_propdlg.cpp

diff --git a/src/xrc/xh_propdlg.cpp b/src/xrc/xh_propdlg.cpp
index 96bd4e2a23e930e033d155c87509c9c2e55f1637..8a7b102e9346cf65a3efd97125263b4db25f4e8b 100644 (file)
--- a/src/xrc/xh_propdlg.cpp
+++ b/src/xrc/xh_propdlg.cpp
@@ -89,12 +89,14 @@ wxObject *wxPropertySheetDialogXmlHandler::DoCreateResource()
                 }
             }
             else
-                wxLogError(wxT("Error in resource."));
+            {
+                ReportError(n, "propertysheetpage child must be a window");
+            }
             return wnd;
         }
         else
         {
-            wxLogError(wxT("Error in resource: no control within wxPropertySheetDialog's <page> tag."));
+            ReportError("propertysheetpage must have a window child");
             return NULL;
         }
     }
@@ -111,7 +113,8 @@ wxObject *wxPropertySheetDialogXmlHandler::DoCreateResource()
                    GetStyle(),
                    GetName());
 
-        if (HasParam(wxT("icon"))) dlg->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
+        if (HasParam(wxT("icon")))
+            dlg->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));
 
         SetupWindow(dlg);