added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

[wxWidgets.git] / samples / proplist / proplist.cpp

diff --git a/samples/proplist/proplist.cpp b/samples/proplist/proplist.cpp
index 8ecd8f2a76d87c39c88497fb853c45c5f9d20e52..af8c22b74e377bfe491f45a195ab99fa08f90834 100644 (file)
--- a/samples/proplist/proplist.cpp
+++ b/samples/proplist/proplist.cpp
@@ -24,6 +24,11 @@
 #include "wx/wx.h"
 #endif
 
 #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)
 #include "proplist.h"
 
 IMPLEMENT_APP(MyApp)


@@ -187,7 +192,7 @@ void MyApp::PropertyListTest(bool useDialog)
 
   if (useDialog)
   {
 
   if (useDialog)
   {

-    view->ShowView(sheet, propDialog);
+    view->ShowView(sheet, (wxPanel *)propDialog);

     propDialog->Centre(wxBOTH);
     propDialog->Show(TRUE);
   }
     propDialog->Centre(wxBOTH);
     propDialog->Show(TRUE);
   }


@@ -232,8 +237,18 @@ void MyApp::PropertyFormTest(bool useDialog)
     propFrame->Initialize();
     m_childWindow = propFrame;
   }
     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
   wxLayoutConstraints* c;
 
 #if 0