IRIX compile fixes

[wxWidgets.git] / src / common / resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index f5168e679671befa4d6088905da7d09549552446..56b976b194a902949700dfe5661edc702aa1fc53 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -45,6 +45,7 @@
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"

+#include "wx/icon.h"

 #include "wx/statbox.h"
 #include "wx/statbmp.h"
 #if wxUSE_GAUGE
 #include "wx/statbox.h"
 #include "wx/statbmp.h"
 #if wxUSE_GAUGE


@@ -651,6 +652,9 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
   }
   dialogItem->SetStyle(windowStyle);
   dialogItem->SetValue1(isModal);
   }
   dialogItem->SetStyle(windowStyle);
   dialogItem->SetValue1(isModal);

+  if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
+    dialogItem->SetValue1(TRUE);
+

   dialogItem->SetName(name);
   dialogItem->SetTitle(title);
   dialogItem->SetSize(x, y, width, height);
   dialogItem->SetName(name);
   dialogItem->SetTitle(title);
   dialogItem->SetSize(x, y, width, height);


@@ -1893,6 +1897,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { _T("wxTB_VERTICAL"), wxTB_VERTICAL},
   { _T("wxTB_FLAT"), wxTB_FLAT},
 
   { _T("wxTB_VERTICAL"), wxTB_VERTICAL},
   { _T("wxTB_FLAT"), wxTB_FLAT},
 

+  /* wxDialog */
+  { _T("wxDIALOG_MODAL"), wxDIALOG_MODAL },
+

   /* Generic */
   { _T("wxVSCROLL"), wxVSCROLL },
   { _T("wxHSCROLL"), wxHSCROLL },
   /* Generic */
   { _T("wxVSCROLL"), wxVSCROLL },
   { _T("wxHSCROLL"), wxHSCROLL },