]> git.saurik.com Git - wxWidgets.git/blobdiff - contrib/src/deprecated/proplist.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed ambiguity between deprecated and new constructor.
[wxWidgets.git] / contrib / src / deprecated / proplist.cpp
diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
index 98f4853ebdb583e01bfb82532c75c6a29d07a31b..4b5d38453f5a2c39ee6dbbbf9eec50dbb3d51601 100644 (file)
--- a/contrib/src/deprecated/proplist.cpp
+++ b/contrib/src/deprecated/proplist.cpp
@@ -156,7 +156,7 @@ bool wxPropertyListView::UpdatePropertyList(bool clearEditArea)
   if (clearEditArea)
   {
     m_valueList->Clear();
-    m_valueText->SetValue( wxT("") );
+    m_valueText->SetValue(wxEmptyString);
   }
   wxNode *node = m_propertySheet->GetProperties().GetFirst();
 
@@ -215,7 +215,7 @@ int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
       return i;
   }
-  return -1;
+  return wxNOT_FOUND;
 }
 
 wxString wxPropertyListView::MakeNameValueString(wxString name, wxString value)
@@ -248,7 +248,7 @@ bool wxPropertyListView::ShowProperty(wxProperty *property, bool select)
   }
 
   m_valueList->Clear();
-  m_valueText->SetValue( wxT("") );
+  m_valueText->SetValue(wxEmptyString);
 
   if (property)
   {
@@ -258,7 +258,7 @@ bool wxPropertyListView::ShowProperty(wxProperty *property, bool select)
   if (select)
   {
     int sel = FindListIndexForProperty(property);
-    if (sel > -1)
+    if (sel != wxNOT_FOUND)
       m_propertyScrollingList->SetSelection(sel);
   }
   return true;
@@ -400,7 +400,7 @@ bool wxPropertyListView::EditProperty(wxProperty *WXUNUSED(property))
 void wxPropertyListView::OnPropertySelect(wxCommandEvent& WXUNUSED(event))
 {
   int sel = m_propertyScrollingList->GetSelection();
-  if (sel > -1)
+  if (sel != wxNOT_FOUND)
   {
     wxProperty *newSel = (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(sel);
     if (newSel && newSel != m_currentProperty)
@@ -423,7 +423,7 @@ bool wxPropertyListView::CreateControls()
     if (!panel)
         return false;
 
-    wxFont guiFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    wxFont guiFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__
     wxFont *boringFont =
@@ -464,15 +464,15 @@ bool wxPropertyListView::CreateControls()
         topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
     }
 
-    m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, _T(""),
-       wxDefaultPosition, wxSize(wxDefaultSize.x, smallButtonSize.y), wxPROCESS_ENTER);
-    m_valueText->Enable(false);
+    m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,
+       wxDefaultPosition, wxSize(wxDefaultCoord, smallButtonSize.y), wxPROCESS_ENTER);
+    m_valueText->Disable();
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
 
     if (m_buttonFlags & wxPROP_PULLDOWN)
     {
         m_editButton = new wxButton(panel, wxID_PROP_EDIT, _T("..."),  wxDefaultPosition, smallButtonSize);
-        m_editButton->Enable(false);
+        m_editButton->Disable();
         topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
     }
 
@@ -482,7 +482,7 @@ bool wxPropertyListView::CreateControls()
 
     m_middleSizer = new wxBoxSizer( wxVERTICAL );
 
-    m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultSize.x, 60));
+    m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultCoord, 60));
     m_valueList->Show(false);
 
     m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));
@@ -826,7 +826,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 != wxT(""))
+  if ( !s.empty() )
   {
     view->GetValueText()->SetValue(s);
     view->RetrieveProperty(property);
@@ -864,11 +864,11 @@ void wxPropertyListValidator::OnEdit(wxProperty *WXUNUSED(property), wxPropertyL
 bool wxPropertyListValidator::OnClearControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(false);
+    view->GetConfirmButton()->Disable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(false);
+    view->GetCancelButton()->Disable();
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(false);
+    view->GetEditButton()->Disable();
   return true;
 }
 
@@ -929,13 +929,13 @@ bool wxRealListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
 bool wxRealListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(true);
+    view->GetConfirmButton()->Enable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(true);
+    view->GetCancelButton()->Enable();
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(false);
+    view->GetEditButton()->Disable();
   if (view->GetValueText())
-    view->GetValueText()->Enable(true);
+    view->GetValueText()->Enable();
   return true;
 }
 
@@ -991,13 +991,13 @@ bool wxIntegerListValidator::OnRetrieveValue(wxProperty *property, wxPropertyLis
 bool wxIntegerListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(true);
+    view->GetConfirmButton()->Enable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(true);
+    view->GetCancelButton()->Enable();
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(false);
+    view->GetEditButton()->Disable();
   if (view->GetValueText())
-    view->GetValueText()->Enable(true);
+    view->GetValueText()->Enable();
   return true;
 }
 
@@ -1054,13 +1054,13 @@ bool wxBoolListValidator::OnDisplayValue(wxProperty *property, wxPropertyListVie
 bool wxBoolListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(false);
+    view->GetConfirmButton()->Disable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(false);
+    view->GetCancelButton()->Disable();
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(true);
+    view->GetEditButton()->Enable();
   if (view->GetValueText())
-    view->GetValueText()->Enable(false);
+    view->GetValueText()->Disable();
   return true;
 }
 
@@ -1069,7 +1069,7 @@ bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property)
   if (view->GetValueList())
   {
     view->ShowListBoxControl(true);
-    view->GetValueList()->Enable(true);
+    view->GetValueList()->Enable();
 
     view->GetValueList()->Append(wxT("True"));
     view->GetValueList()->Append(wxT("False"));
@@ -1086,7 +1086,7 @@ bool wxBoolListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property),
   {
     view->GetValueList()->Clear();
     view->ShowListBoxControl(false);
-    view->GetValueList()->Enable(false);
+    view->GetValueList()->Disable();
   }
   return true;
 }
@@ -1175,27 +1175,27 @@ bool wxStringListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wx
   if (!m_strings)
   {
     if (view->GetEditButton())
-      view->GetEditButton()->Enable(false);
+      view->GetEditButton()->Disable();
     if (view->GetConfirmButton())
-      view->GetConfirmButton()->Enable(true);
+      view->GetConfirmButton()->Enable();
     if (view->GetCancelButton())
-      view->GetCancelButton()->Enable(true);
+      view->GetCancelButton()->Enable();
     if (view->GetValueText())
-      view->GetValueText()->Enable(true);
+      view->GetValueText()->Enable();
     return true;
   }
 
   // Constrained
   if (view->GetValueText())
-    view->GetValueText()->Enable(false);
+    view->GetValueText()->Disable();
 
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(true);
+    view->GetEditButton()->Enable();
 
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(false);
+    view->GetConfirmButton()->Disable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(false);
+    view->GetCancelButton()->Disable();
   return true;
 }
 
@@ -1206,7 +1206,7 @@ bool wxStringListValidator::OnPrepareDetailControls( wxProperty *property,
   if (view->GetValueList())
   {
     view->ShowListBoxControl(true);
-    view->GetValueList()->Enable(true);
+    view->GetValueList()->Enable();
     wxStringList::Node  *node = m_strings->GetFirst();
     while (node)
     {
@@ -1231,7 +1231,7 @@ bool wxStringListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property)
   {
     view->GetValueList()->Clear();
     view->ShowListBoxControl(false);
-    view->GetValueList()->Enable(false);
+    view->GetValueList()->Disable();
   }
   return true;
 }
@@ -1326,11 +1326,11 @@ bool wxFilenameListValidator::OnDoubleClick(wxProperty *property, wxPropertyList
 bool wxFilenameListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(true);
+    view->GetConfirmButton()->Enable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(true);
+    view->GetCancelButton()->Enable();
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(true);
+    view->GetEditButton()->Enable();
   if (view->GetValueText())
     view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
   return true;
@@ -1349,7 +1349,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
      m_filenameWildCard.GetData(),
      0,
      parentWindow);
-  if (s != wxT(""))
+  if ( !s.empty() )
   {
     property->GetValue() = s;
     view->DisplayProperty(property);
@@ -1414,15 +1414,19 @@ bool wxColourListValidator::OnDoubleClick(wxProperty *property, wxPropertyListVi
 
 bool wxColourListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(true);
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(true);
-  if (view->GetEditButton())
-    view->GetEditButton()->Enable(true);
-  if (view->GetValueText())
-    view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
-  return true;
+    if (view->GetConfirmButton())
+        view->GetConfirmButton()->Enable();
+
+    if (view->GetCancelButton())
+        view->GetCancelButton()->Enable();
+
+    if (view->GetEditButton())
+        view->GetEditButton()->Enable();
+
+    if (view->GetValueText())
+        view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
+
+    return true;
 }
 
 void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
@@ -1431,14 +1435,14 @@ void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *vie
     return;
 
   wxChar *s = property->GetValue().StringValue();
-  int r = 0;
-  int g = 0;
-  int b = 0;
+  unsigned char r = 0;
+  unsigned char g = 0;
+  unsigned char b = 0;
   if (s)
   {
-    r = wxHexToDec(s);
-    g = wxHexToDec(s+2);
-    b = wxHexToDec(s+4);
+    r = (unsigned char)wxHexToDec(s);
+    g = (unsigned char)wxHexToDec(s+2);
+    b = (unsigned char)wxHexToDec(s+4);
   }
 
   wxColour col(r,g,b);
@@ -1449,7 +1453,9 @@ void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *vie
 
   for (int i = 0; i < 16; i++)
   {
-    wxColour colour(i*16, i*16, i*16);
+    wxColour colour((unsigned char)(i*16),
+                    (unsigned char)(i*16),
+                    (unsigned char)(i*16));
     data.SetCustomColour(i, colour);
   }
 
@@ -1509,14 +1515,14 @@ bool wxListOfStringsListValidator::OnDisplayValue(wxProperty *property, wxProper
 bool wxListOfStringsListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   if (view->GetEditButton())
-    view->GetEditButton()->Enable(true);
+    view->GetEditButton()->Enable();
   if (view->GetValueText())
-    view->GetValueText()->Enable(false);
+    view->GetValueText()->Disable();
 
   if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable(false);
+    view->GetConfirmButton()->Disable();
   if (view->GetCancelButton())
-    view->GetCancelButton()->Enable(false);
+    view->GetCancelButton()->Disable();
   return true;
 }
 
@@ -1651,9 +1657,9 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
     wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
 
   dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
-  wxID_PROP_SL_TEXT, wxT(""), wxPoint(5, 240),
-       wxSize(300, wxDefaultSize.y), wxPROCESS_ENTER);
-  dialog->m_stringText->Enable(false);
+       wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),
+       wxSize(300, wxDefaultCoord), wxPROCESS_ENTER);
+  dialog->m_stringText->Disable();
 
   wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
   wxButton *deleteButton = new wxButton(dialog, wxID_PROP_SL_DELETE, wxT("Delete"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
@@ -1665,15 +1671,15 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
 #endif
 
   wxBoxSizer *m_bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
-  m_bottom_sizer->Add(addButton, 0, wxALL | wxALIGN_LEFT, 2 ); 
-  m_bottom_sizer->Add(deleteButton, 0, wxALL | wxALIGN_LEFT, 2 ); 
+  m_bottom_sizer->Add(addButton, 0, wxALL | wxALIGN_LEFT, 2 );
+  m_bottom_sizer->Add(deleteButton, 0, wxALL | wxALIGN_LEFT, 2 );
   m_bottom_sizer->Add(1, 1, 1, wxEXPAND | wxALL);
-  m_bottom_sizer->Add(cancelButton, 0, wxALL | wxALIGN_RIGHT, 2 ); 
-  m_bottom_sizer->Add(okButton, 0, wxALL | wxALIGN_RIGHT, 2 ); 
+  m_bottom_sizer->Add(cancelButton, 0, wxALL | wxALIGN_RIGHT, 2 );
+  m_bottom_sizer->Add(okButton, 0, wxALL | wxALIGN_RIGHT, 2 );
 
   wxBoxSizer *m_sizer = new wxBoxSizer( wxVERTICAL );
-  m_sizer->Add(dialog->m_listBox, 1, wxEXPAND | wxALL, 2 ); 
-  m_sizer->Add(dialog->m_stringText, 0, wxEXPAND | wxALL, 2 ); 
+  m_sizer->Add(dialog->m_listBox, 1, wxEXPAND | wxALL, 2 );
+  m_sizer->Add(dialog->m_stringText, 0, wxEXPAND | wxALL, 2 );
   m_sizer->Add(m_bottom_sizer, 0, wxEXPAND | wxALL , 0 );
 
   dialog->SetSizer( m_sizer );
@@ -1707,7 +1713,7 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
 void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))
 {
   int sel = m_listBox->GetSelection();
-  if (sel > -1)
+  if (sel != wxNOT_FOUND)
   {
     m_currentSelection = sel;
 
@@ -1718,7 +1724,7 @@ void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event)
 void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
   int sel = m_listBox->GetSelection();
-  if (sel == -1)
+  if (sel == wxNOT_FOUND)
     return;
 
   wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(sel);
@@ -1729,7 +1735,7 @@ void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
   delete[] (wxChar *)node->GetData();
   delete node;
   m_currentSelection = -1;
-  m_stringText->SetValue(_T(""));
+  m_stringText->SetValue(wxEmptyString);
 }
 
 void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
@@ -1798,13 +1804,13 @@ void wxPropertyStringListEditorDialog::ShowCurrentSelection()
 {
   if (m_currentSelection == -1)
   {
-    m_stringText->SetValue(wxT(""));
+    m_stringText->SetValue(wxEmptyString);
     return;
   }
   wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);
   wxChar *txt = (wxChar *)node->GetData();
   m_stringText->SetValue(txt);
-  m_stringText->Enable(true);
+  m_stringText->Enable();
 }
 
 
wxWidgets (Impactor)