Rebake for 2.6.2

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

diff --git a/contrib/samples/deprecated/proplist/proplist.cpp b/contrib/samples/deprecated/proplist/proplist.cpp
index 82f3ab52e1b70d11f2bb8f2d67b3bfe7c046e370..ea5e4e9931c39e4b5711a0e0fdc96efcfcb06179 100644 (file)
--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ b/contrib/samples/deprecated/proplist/proplist.cpp
@@ -75,7 +75,7 @@ bool MyApp::OnInit(void)
   m_mainFrame->Show(true);
 
   SetTopWindow(m_mainFrame);
-    
+
   return true;
 }
 
@@ -182,7 +182,7 @@ void MyApp::PropertyListTest(bool useDialog)
     if (useDialog)
     {
         propDialog = new PropListDialog(view, NULL, _T("Property Sheet Test"),
-            wxDefaultPosition, wxSize(400, 500), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODELESS);
+            wxDefaultPosition, wxSize(400, 500));
         m_childWindow = propDialog;
     }
     else
@@ -230,7 +230,7 @@ void MyApp::PropertyFormTest(bool useDialog)
     if (useDialog)
     {
         propDialog = new PropFormDialog(view, NULL, _T("Property Form Test"),
-            wxDefaultPosition, wxSize(380, 250), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL);
+            wxDefaultPosition, wxSize(380, 250));
         m_childWindow = propDialog;
     }
     else
@@ -266,7 +266,7 @@ void MyApp::PropertyFormTest(bool useDialog)
         panel->SetConstraints(c);
     }
 #endif
- 
+
     // Add items to the panel
     wxButton *okButton = new wxButton(panel, wxID_OK, _T("OK"), wxDefaultPosition,
         wxSize(80, 26), 0, wxDefaultValidator, _T("ok"));
@@ -306,8 +306,8 @@ void MyApp::PropertyFormTest(bool useDialog)
     okButton->SetConstraints(c);
 
     // The name of this text item matches the "fred" property
-    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition, 
-        wxSize( 200, wxDefaultSize.y), 0, wxDefaultValidator, _T("fred"));
+    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition,
+        wxSize( 200, wxDefaultCoord), 0, wxDefaultValidator, _T("fred"));
 
     c = new wxLayoutConstraints;
     c->left.SameAs(panel, wxLeft, 4);