Corrected DoBlit

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

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

-#include "wx/wx.h"

 #endif
 
 #include "wx/propform.h"
 #endif
 
 #include "wx/propform.h"


@@ -713,7 +712,7 @@ 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'
             wxNode *node = m_strings->First();
         {
             // Try to initialize the listbox from 'strings'
             wxNode *node = m_strings->First();


@@ -737,7 +736,7 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
     {
         wxChoice *choice = (wxChoice *)m_propertyWindow;
 #ifndef __XVIEW__
     {
         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.