Document wxTextCtrl::XYToPosition, PositionToXY and GetLineLength change

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

diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
index 10a3e9fa8f858d506009c8ee622191dcba92dada..4b5d38453f5a2c39ee6dbbbf9eec50dbb3d51601 100644 (file)
--- a/contrib/src/deprecated/proplist.cpp
+++ b/contrib/src/deprecated/proplist.cpp
@@ -215,7 +215,7 @@ int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
       return i;
   }
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
       return i;
   }

-  return -1;
+  return wxNOT_FOUND;

 }
 
 wxString wxPropertyListView::MakeNameValueString(wxString name, wxString value)
 }
 
 wxString wxPropertyListView::MakeNameValueString(wxString name, wxString value)


@@ -258,7 +258,7 @@ bool wxPropertyListView::ShowProperty(wxProperty *property, bool select)
   if (select)
   {
     int sel = FindListIndexForProperty(property);
   if (select)
   {
     int sel = FindListIndexForProperty(property);

-    if (sel > -1)
+    if (sel != wxNOT_FOUND)

       m_propertyScrollingList->SetSelection(sel);
   }
   return true;
       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();
 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)
   {
     wxProperty *newSel = (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(sel);
     if (newSel && newSel != m_currentProperty)


@@ -423,7 +423,7 @@ bool wxPropertyListView::CreateControls()
     if (!panel)
         return false;
 
     if (!panel)
         return false;
 

-    wxFont guiFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    wxFont guiFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 
 #ifdef __WXMSW__
     wxFont *boringFont =
 
 #ifdef __WXMSW__
     wxFont *boringFont =


@@ -465,7 +465,7 @@ bool wxPropertyListView::CreateControls()
     }
 
     m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,
     }
 
     m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,

-       wxDefaultPosition, wxSize(wxDefaultSize.x, smallButtonSize.y), wxPROCESS_ENTER);
+       wxDefaultPosition, wxSize(wxDefaultCoord, smallButtonSize.y), wxPROCESS_ENTER);

     m_valueText->Disable();
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
 
     m_valueText->Disable();
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
 


@@ -482,7 +482,7 @@ bool wxPropertyListView::CreateControls()
 
     m_middleSizer = new wxBoxSizer( wxVERTICAL );
 
 
     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));
     m_valueList->Show(false);
 
     m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));


@@ -1435,14 +1435,14 @@ void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *vie
     return;
 
   wxChar *s = property->GetValue().StringValue();
     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)
   {
   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);
   }
 
   wxColour col(r,g,b);


@@ -1453,7 +1453,9 @@ void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *vie
 
   for (int i = 0; i < 16; i++)
   {
 
   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);
   }
 
     data.SetCustomColour(i, colour);
   }
 


@@ -1656,7 +1658,7 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
 
   dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
        wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),
 
   dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
        wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),

-       wxSize(300, wxDefaultSize.y), wxPROCESS_ENTER);
+       wxSize(300, wxDefaultCoord), wxPROCESS_ENTER);

   dialog->m_stringText->Disable();
 
   wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
   dialog->m_stringText->Disable();
 
   wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));


@@ -1711,7 +1713,7 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
 void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))
 {
   int sel = m_listBox->GetSelection();
 void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))
 {
   int sel = m_listBox->GetSelection();

-  if (sel > -1)
+  if (sel != wxNOT_FOUND)

   {
     m_currentSelection = sel;
 
   {
     m_currentSelection = sel;
 


@@ -1722,7 +1724,7 @@ void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event)
 void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
   int sel = m_listBox->GetSelection();
 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);
     return;
 
   wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(sel);