X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22aed133d8b52cc2e9a2d1c644e56a820f5df733..b838cfc9151aea38402ad2b1ba5d2f97cf94e973:/src/generic/proplist.cpp

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index c7374c15a2..55722a5c10 100644
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_PROPSHEET
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/font.h"
@@ -72,7 +74,7 @@ static wxBitmap *GetCrossBitmap();
 // Property text edit control
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPropertyTextEdit, wxTextCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyTextEdit, wxTextCtrl)
 
 wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
     const wxWindowID id, const wxString& value,
@@ -215,7 +217,7 @@ bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
 // Find the wxListBox index corresponding to this property
 int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
 {
-  int n = m_propertyScrollingList->Number();
+  int n = m_propertyScrollingList->GetCount();
   for (int i = 0; i < n; i++)
   {
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
@@ -420,7 +422,7 @@ bool wxPropertyListView::CreateControls()
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 
-    wxSize largeButtonSize( 60, 25 );
+    wxSize largeButtonSize( 70, 25 );
     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)
@@ -511,7 +513,7 @@ bool wxPropertyListView::CreateControls()
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();
-            bottomsizer->Add( m_windowCloseButton, 0, wxLEFT|wxTOP|wxBOTTOM, buttonborder );
+            bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {
@@ -529,7 +531,7 @@ bool wxPropertyListView::CreateControls()
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }
 
-        mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
+        mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );
     }
 
     panel->SetSizer( mainsizer );
@@ -675,7 +677,7 @@ void wxPropertyListView::OnText(wxCommandEvent& event)
 // Property dialog box
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPropertyListDialog, wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL,                wxPropertyListDialog::OnCancel)
@@ -735,7 +737,7 @@ bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
 // Property panel
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListPanel, wxPanel)
 
 BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
     EVT_SIZE(wxPropertyListPanel::OnSize)
@@ -771,7 +773,7 @@ void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))
 // Property frame
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListFrame, wxFrame)
 
 BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
     EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
@@ -830,7 +832,7 @@ bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxProp
 bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   wxString s(view->GetValueList()->GetStringSelection());
-  if (s != _T(""))
+  if (s != wxT(""))
   {
     view->GetValueText()->SetValue(s);
     view->RetrieveProperty(property);
@@ -898,8 +900,8 @@ bool wxRealListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropert
   if (!StringToFloat(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];
-    wxSprintf(buf, _T("Value %s is not a valid real number!"), value.GetData());
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
     return FALSE;
   }
 
@@ -961,15 +963,15 @@ bool wxIntegerListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxProp
   if (!StringToLong(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];
-    wxSprintf(buf, _T("Value %s is not a valid integer!"), value.GetData());
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
     return FALSE;
   }
   if (val < m_integerMin || val > m_integerMax)
   {
     wxChar buf[200];
-    wxSprintf(buf, _T("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
     return FALSE;
   }
   return TRUE;
@@ -1015,9 +1017,9 @@ bool wxBoolListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropert
   if (!view->GetValueText())
     return FALSE;
   wxString value(view->GetValueText()->GetValue());
-  if (value != _T("True") && value != _T("False"))
+  if (value != wxT("True") && value != wxT("False"))
   {
-    wxMessageBox(_T("Value must be True or False!"), _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxMessageBox(wxT("Value must be True or False!"), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
     return FALSE;
   }
   return TRUE;
@@ -1036,7 +1038,7 @@ bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
 
   wxString value(view->GetValueText()->GetValue());
   bool boolValue = FALSE;
-  if (value == _T("True"))
+  if (value == wxT("True"))
     boolValue = TRUE;
   else
     boolValue = FALSE;
@@ -1079,8 +1081,8 @@ bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property)
     view->ShowListBoxControl(TRUE);
     view->GetValueList()->Enable(TRUE);
 
-    view->GetValueList()->Append(_T("True"));
-    view->GetValueList()->Append(_T("False"));
+    view->GetValueList()->Append(wxT("True"));
+    view->GetValueList()->Append(wxT("False"));
     wxChar *currentString = copystring(view->GetValueText()->GetValue());
     view->GetValueList()->SetStringSelection(currentString);
     delete[] currentString;
@@ -1170,7 +1172,7 @@ bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListV
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str);
-  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->Number() > 0)
+  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->GetCount() > 0)
   {
     view->GetValueList()->SetStringSelection(str);
   }
@@ -1353,7 +1355,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
      m_filenameWildCard.GetData(),
      0,
      parentWindow);
-  if (s != _T(""))
+  if (s != wxT(""))
   {
     property->GetValue() = s;
     view->DisplayProperty(property);
@@ -1546,7 +1548,7 @@ void wxListOfStringsListValidator::OnEdit(wxProperty *property, wxPropertyListVi
     expr = expr->GetNext();
   }
 
-  wxString title(_T("Editing "));
+  wxString title(wxT("Editing "));
   title += property->GetName();
 
   if (EditStringList(parentWindow, stringList, title.GetData()))
@@ -1766,7 +1768,7 @@ void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
 {
   SaveCurrentSelection();
 
-  wxChar *initialText = _T("");
+  wxChar *initialText = wxT("");
   wxNode *node = m_stringList->Add(initialText);
   m_listBox->Append(initialText, (void *)node);
   m_currentSelection = m_stringList->Number() - 1;
@@ -1851,7 +1853,7 @@ static wxBitmap *GetTickBitmap()
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 
-        #if defined(__WXMSW__) || defined(__WXOS2__)
+        #if defined(__WXMSW__) || defined(__WXPM__)
             s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
         #else
             s_tickBitmap = new wxBitmap( tick_xpm );
@@ -1870,7 +1872,7 @@ static wxBitmap *GetCrossBitmap()
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 
-        #if defined(__WXMSW__) || defined(__WXOS2__)
+        #if defined(__WXMSW__) || defined(__WXPM__)
             s_crossBitmap =  new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
         #else // XPMs
             s_crossBitmap =  new wxBitmap( cross_xpm );
@@ -1880,3 +1882,4 @@ static wxBitmap *GetCrossBitmap()
     return s_crossBitmap;
 }
 
+#endif // wxUSE_PROPSHEET