Removed unnecessary code from utilsunx.cpp

[wxWidgets.git] / include / wx / proplist.h

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index 2df1170cb9a2a073044cb3c5e48ea8760f458ea5..de72221bbdd9b221673d70d9c4c299f3b7dc00b2 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -172,12 +172,10 @@ public:
   wxButton*         m_confirmButton;  // A tick, as in VB
   wxButton*         m_cancelButton;   // A cross, as in VB
   wxButton*         m_editButton;     // Invokes the custom validator, if any
   wxButton*         m_confirmButton;  // A tick, as in VB
   wxButton*         m_cancelButton;   // A cross, as in VB
   wxButton*         m_editButton;     // Invokes the custom validator, if any

+  wxSizer*          m_middleSizer;

 
   bool              m_detailedEditing;     // E.g. using listbox for choices
 
 
   bool              m_detailedEditing;     // E.g. using listbox for choices
 

-  static wxBitmap*  sm_tickBitmap;
-  static wxBitmap*  sm_crossBitmap;
-

   wxPanel*          m_propertyWindow; // Panel that the controls will appear on
   wxWindow*         m_managedWindow; // Frame or dialog
 
   wxPanel*          m_propertyWindow; // Panel that the controls will appear on
   wxWindow*         m_managedWindow; // Frame or dialog
 


@@ -347,6 +345,7 @@ class WXDLLEXPORT wxPropertyListFrame: public wxFrame
   virtual bool Initialize(void);
   virtual wxPropertyListPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
   inline virtual wxPropertyListPanel *GetPropertyPanel(void) const { return m_propertyPanel; }
   virtual bool Initialize(void);
   virtual wxPropertyListPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
   inline virtual wxPropertyListPanel *GetPropertyPanel(void) const { return m_propertyPanel; }

+  inline wxPropertyListView* GetView() const { return m_view; }

 
  private:
   wxPropertyListView*       m_view;
 
  private:
   wxPropertyListView*       m_view;


@@ -480,7 +479,7 @@ class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
  public:

-   wxFilenameListValidator(wxString message = "Select a file", wxString wildcard = "*.*", long flags = 0);
+   wxFilenameListValidator(wxString message = "Select a file", wxString wildcard = wxALL_FILES_PATTERN, long flags = 0);

 
    ~wxFilenameListValidator(void);
 
 
    ~wxFilenameListValidator(void);
 


@@ -554,7 +553,7 @@ class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
    // Called when the property is double clicked.
    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
    // Called when the property is double clicked.
    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 

-   bool EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title = _T("String List Editor"));
+   bool EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title = wxT("String List Editor"));

 
    // Called when the edit (...) button is pressed.
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
    // Called when the edit (...) button is pressed.
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);