X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4693b20c7500190c3cc8c02919c45436bf5efbc9..25faedaa980466a082a25055736b2c3c66d4675b:/samples/proplist/proplist.cpp?ds=sidebyside

diff --git a/samples/proplist/proplist.cpp b/samples/proplist/proplist.cpp
index 8ecd8f2a76..af8c22b74e 100644
--- a/samples/proplist/proplist.cpp
+++ b/samples/proplist/proplist.cpp
@@ -24,6 +24,11 @@
 #include "wx/wx.h"
 #endif
 
+
+#if !wxUSE_PROPSHEET
+#error Please set wxUSE_PROPSHEET to 1 in include/wx/msw/setup.h and recompile.
+#endif
+
 #include "proplist.h"
 
 IMPLEMENT_APP(MyApp)
@@ -187,7 +192,7 @@ void MyApp::PropertyListTest(bool useDialog)
 
   if (useDialog)
   {
-    view->ShowView(sheet, propDialog);
+    view->ShowView(sheet, (wxPanel *)propDialog);
     propDialog->Centre(wxBOTH);
     propDialog->Show(TRUE);
   }
@@ -232,8 +237,18 @@ void MyApp::PropertyFormTest(bool useDialog)
     propFrame->Initialize();
     m_childWindow = propFrame;
   }
-  
-  wxPanel *panel = propDialog ? propDialog : propFrame->GetPropertyPanel();
+
+  // BCC32 does not like ?:
+  wxWindow *panel ;
+  if ( propDialog )
+  {
+    panel = propDialog ;
+  }
+  else
+  {
+    panel = propFrame->GetPropertyPanel() ;
+  }
+    
   wxLayoutConstraints* c;
 
 #if 0