Font work.

[wxWidgets.git] / src / generic / propform.cpp

diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp
index 4f1b06f67fa938b3d9c494b5af28ffa5e604472e..21dc41e4aea2c506c1113fdcd75fc4dff72bcc39 100644 (file)
--- a/src/generic/propform.cpp
+++ b/src/generic/propform.cpp
@@ -23,9 +23,9 @@
 #if wxUSE_PROPSHEET
 
 #ifndef WX_PRECOMP
 #if wxUSE_PROPSHEET
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"

 #endif
 
 #endif
 

+#include "wx/wx.h"

 #include "wx/propform.h"
 
 #include <ctype.h>
 #include "wx/propform.h"
 
 #include <ctype.h>


@@ -87,10 +87,10 @@ bool wxPropertyFormView::Check(void)
     if (!m_propertySheet)
         return FALSE;
 
     if (!m_propertySheet)
         return FALSE;
 

-    wxNode *node = m_propertySheet->GetProperties().First();
+    wxNode *node = m_propertySheet->GetProperties().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxProperty *prop = (wxProperty *)node->Data();
+        wxProperty *prop = (wxProperty *)node->GetData();

         wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
         {
         wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
         {


@@ -98,7 +98,7 @@ bool wxPropertyFormView::Check(void)
             if (!formValidator->OnCheckValue(prop, this, m_propertyWindow))
                 return FALSE;
         }
             if (!formValidator->OnCheckValue(prop, this, m_propertyWindow))
                 return FALSE;
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -108,17 +108,17 @@ bool wxPropertyFormView::TransferToPropertySheet(void)
     if (!m_propertySheet)
         return FALSE;
 
     if (!m_propertySheet)
         return FALSE;
 

-    wxNode *node = m_propertySheet->GetProperties().First();
+    wxNode *node = m_propertySheet->GetProperties().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxProperty *prop = (wxProperty *)node->Data();
+        wxProperty *prop = (wxProperty *)node->GetData();

         wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
         {
             wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
             formValidator->OnRetrieveValue(prop, this, m_propertyWindow);
         }
         wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
         {
             wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
             formValidator->OnRetrieveValue(prop, this, m_propertyWindow);
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -128,17 +128,17 @@ bool wxPropertyFormView::TransferToDialog(void)
     if (!m_propertySheet)
         return FALSE;
 
     if (!m_propertySheet)
         return FALSE;
 

-    wxNode *node = m_propertySheet->GetProperties().First();
+    wxNode *node = m_propertySheet->GetProperties().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxProperty *prop = (wxProperty *)node->Data();
+        wxProperty *prop = (wxProperty *)node->GetData();

         wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
         {
             wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
             formValidator->OnDisplayValue(prop, this, m_propertyWindow);
         }
         wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
         {
             wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
             formValidator->OnDisplayValue(prop, this, m_propertyWindow);
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -148,17 +148,17 @@ bool wxPropertyFormView::AssociateNames(void)
     if (!m_propertySheet || !m_propertyWindow)
         return FALSE;
 
     if (!m_propertySheet || !m_propertyWindow)
         return FALSE;
 

-    wxNode *node = m_propertyWindow->GetChildren().First();
+    wxWindowList::Node  *node = m_propertyWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow *win = (wxWindow *)node->Data();
-        if (win->GetName() != wxT(""))
+        wxWindow *win = node->GetData();
+        if ( win->GetName() != wxEmptyString )

         {
             wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
             if (prop)
                 prop->SetWindow(win);
         }
         {
             wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
             if (prop)
                 prop->SetWindow(win);
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -229,10 +229,10 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
     else
     {
         // Find a validator to route the command to.
     else
     {
         // Find a validator to route the command to.

-        wxNode *node = m_propertySheet->GetProperties().First();
+        wxNode *node = m_propertySheet->GetProperties().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxProperty *prop = (wxProperty *)node->Data();
+            wxProperty *prop = (wxProperty *)node->GetData();

             if (prop->GetWindow() && (prop->GetWindow() == &win))
             {
                 wxPropertyValidator *validator = FindPropertyValidator(prop);
             if (prop->GetWindow() && (prop->GetWindow() == &win))
             {
                 wxPropertyValidator *validator = FindPropertyValidator(prop);


@@ -243,7 +243,7 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
                     return;
                 }
             }
                     return;
                 }
             }

-            node = node->Next();
+            node = node->GetNext();

         }
     }
 }
         }
     }
 }


@@ -268,10 +268,10 @@ void wxPropertyFormView::OnDoubleClick(wxControl *item)
         return;
 
     // Find a validator to route the command to.
         return;
 
     // Find a validator to route the command to.

-    wxNode *node = m_propertySheet->GetProperties().First();
+    wxNode *node = m_propertySheet->GetProperties().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxProperty *prop = (wxProperty *)node->Data();
+        wxProperty *prop = (wxProperty *)node->GetData();

         if (prop->GetWindow() && ((wxControl *)prop->GetWindow() == item))
         {
             wxPropertyValidator *validator = FindPropertyValidator(prop);
         if (prop->GetWindow() && ((wxControl *)prop->GetWindow() == item))
         {
             wxPropertyValidator *validator = FindPropertyValidator(prop);


@@ -282,7 +282,7 @@ void wxPropertyFormView::OnDoubleClick(wxControl *item)
                 return;
             }
         }
                 return;
             }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -518,9 +518,9 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi
 
     if (val < m_integerMin || val > m_integerMax)
     {
 
     if (val < m_integerMin || val > m_integerMax)
     {

-        char buf[200];
-        sprintf(buf, "Value must be an integer between %ld and %ld!", m_integerMin, m_integerMax);
-        wxMessageBox(buf, "Property value error", wxOK | wxICON_EXCLAMATION, parentWindow);
+        wxChar buf[200];
+        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;
         return FALSE;
     }
     return TRUE;


@@ -645,10 +645,10 @@ bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVie
         wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
         if (!m_strings->Member(text->GetValue()))
         {
         wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
         if (!m_strings->Member(text->GetValue()))
         {

-            wxString s("Value ");
-            s += text->GetValue();
-            s += " is not valid.";
-            wxMessageBox(s, "Property value error", wxOK | wxICON_EXCLAMATION, parentWindow);
+            wxString str( wxT("Value ") );
+            str += text->GetValue();
+            str += wxT(" is not valid.");
+            wxMessageBox(str, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

             return FALSE;
         }
     }
             return FALSE;
         }
     }


@@ -713,15 +713,15 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
     {
         wxListBox *lbox = (wxListBox *)m_propertyWindow;
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
     {
         wxListBox *lbox = (wxListBox *)m_propertyWindow;

-        if (lbox->Number() == 0 && m_strings)
+        if (lbox->GetCount() == 0 && m_strings)

         {
             // Try to initialize the listbox from 'strings'
         {
             // Try to initialize the listbox from 'strings'

-            wxNode *node = m_strings->First();
+            wxStringList::Node  *node = m_strings->GetFirst();

             while (node)
             {
             while (node)
             {

-                char *s = (char *)node->Data();
+                wxChar *s = node->GetData();

                 lbox->Append(s);
                 lbox->Append(s);

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         lbox->SetStringSelection(property->GetValue().StringValue());
             }
         }
         lbox->SetStringSelection(property->GetValue().StringValue());


@@ -736,20 +736,18 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
     {
         wxChoice *choice = (wxChoice *)m_propertyWindow;
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
     {
         wxChoice *choice = (wxChoice *)m_propertyWindow;

-#ifndef __XVIEW__
-        if (choice->Number() == 0 && m_strings)
+        if (choice->GetCount() == 0 && m_strings)

         {
             // Try to initialize the choice item from 'strings'
             // XView doesn't allow this kind of thing.
         {
             // Try to initialize the choice item from 'strings'
             // XView doesn't allow this kind of thing.

-            wxNode *node = m_strings->First();
+            wxStringList::Node  *node = m_strings->GetFirst();

             while (node)
             {
             while (node)
             {

-                char *s = (char *)node->Data();
+                wxChar *s = node->GetData();

                 choice->Append(s);
                 choice->Append(s);

-                node = node->Next();
+                node = node->GetNext();

             }
         }
             }
         }

-#endif

         choice->SetStringSelection(property->GetValue().StringValue());
     }
     else
         choice->SetStringSelection(property->GetValue().StringValue());
     }
     else