Removed some bugs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxprop/src/proplist.cpp b/utils/wxprop/src/proplist.cpp
index 9e9b60f0534dda2cfdaa32490e4d792ea2c51d7c..edfc2aaa4e52c2c70f616e3579f0b89f2e09eafe 100644 (file)
--- a/utils/wxprop/src/proplist.cpp
+++ b/utils/wxprop/src/proplist.cpp
@@ -80,7 +80,7 @@ BEGIN_EVENT_TABLE(wxPropertyListView, wxPropertyView)
        EVT_TEXT_ENTER(wxID_PROP_TEXT,  wxPropertyListView::OnText)
        EVT_LISTBOX(wxID_PROP_SELECT,   wxPropertyListView::OnPropertySelect)
     EVT_COMMAND(wxID_PROP_SELECT, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxPropertyListView::OnPropertyDoubleClick)
        EVT_TEXT_ENTER(wxID_PROP_TEXT,  wxPropertyListView::OnText)
        EVT_LISTBOX(wxID_PROP_SELECT,   wxPropertyListView::OnPropertySelect)
     EVT_COMMAND(wxID_PROP_SELECT, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxPropertyListView::OnPropertyDoubleClick)

-       EVT_TEXT(wxID_PROP_VALUE_SELECT,        wxPropertyListView::OnValueListSelect)
+       EVT_LISTBOX(wxID_PROP_VALUE_SELECT,     wxPropertyListView::OnValueListSelect)

 END_EVENT_TABLE()
 
 bool wxPropertyListView::dialogCancelled = FALSE;
 END_EVENT_TABLE()
 
 bool wxPropertyListView::dialogCancelled = FALSE;


@@ -425,9 +425,9 @@ bool wxPropertyListView::CreateControls(void)
   wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__
   wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__

-  wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, "Courier New");
+  wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL, FALSE, "Courier New");

 #else
 #else

-  wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL);
+  wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);

 #endif
 
   // May need to be changed in future to eliminate clashes with app.
 #endif
 
   // May need to be changed in future to eliminate clashes with app.


@@ -661,9 +661,17 @@ void wxPropertyListView::ShowListBoxControl(bool show)
       if (constraints)
       {
         if (show)
       if (constraints)
       {
         if (show)

+        {

           constraints->top.Below(valueList, 2);
           constraints->top.Below(valueList, 2);

+          // Maintain back-pointer so when valueList is deleted,
+          // any reference to it from this window is removed.
+          valueList->AddConstraintReference(propertyScrollingList);
+        }

         else
         else

+        {

           constraints->top.Below(valueText, 2);
           constraints->top.Below(valueText, 2);

+          valueText->AddConstraintReference(propertyScrollingList);
+        }

         propertyWindow->Layout();
       }
     }
         propertyWindow->Layout();
       }
     }


@@ -848,6 +856,10 @@ BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
     EVT_SIZE(wxPropertyListPanel::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxPropertyListPanel::OnSize)
 END_EVENT_TABLE()
 

+wxPropertyListPanel::~wxPropertyListPanel()
+{
+}
+

 void wxPropertyListPanel::OnDefaultAction(wxControl *item)
 {
 /*
 void wxPropertyListPanel::OnDefaultAction(wxControl *item)
 {
 /*


@@ -1263,7 +1275,7 @@ bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListV
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str.GetData());
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str.GetData());

-  if (strings)
+  if (strings && view->GetValueList() && view->GetValueList()->Number() > 0)

   {
     view->GetValueList()->SetStringSelection(str.GetData());
   }
   {
     view->GetValueList()->SetStringSelection(str.GetData());
   }

diff --git a/utils/wxprop/src/proplist.h b/utils/wxprop/src/proplist.h
index 14897f62a8c4803052d67e90ebc987f7cdc7a58f..5c066a50717b8d725497f1bbd3d725294a9518c5 100644 (file)
--- a/utils/wxprop/src/proplist.h
+++ b/utils/wxprop/src/proplist.h
@@ -300,6 +300,7 @@ class wxPropertyListPanel: public wxPanel
   {
     view = v;
   }
   {
     view = v;
   }

+  ~wxPropertyListPanel();

   void OnDefaultAction(wxControl *item);
 
   inline void SetView(wxPropertyListView* v) { view = v; }
   void OnDefaultAction(wxControl *item);
 
   inline void SetView(wxPropertyListView* v) { view = v; }