Simplified and extended compiler detection for OS/2.

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

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 2685be16e06aeee8192317d869a7a5ef6e81fede..b88359aa1daf47cc0e2e9e21aaf90c90f86d7ca3 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_frame.h"
 #endif
 
@@ -71,6 +71,8 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
         frame->SetClientSize(GetSize());
     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());
+    if (HasParam(wxT("icon")))
+        frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
 
     SetupWindow(frame);