1. wxLog::FlushActive() added

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

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index a3c6a5e24f481df79efd855c55a814901b36a246..2a7bc18e8375960803bc9db5176539f1584807d6 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -159,7 +159,7 @@ class WXDLLEXPORT wxPropertyListView: public wxPropertyView
   inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
   inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
   inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }
   inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
   inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
   inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }

-  
+

   bool OnClose(void);
 
 public:
   bool OnClose(void);
 
 public:


@@ -172,20 +172,21 @@ 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

-  
+

   wxButton*         m_windowCloseButton; // Or OK
   wxButton*         m_windowCancelButton;
   wxButton*         m_windowHelpButton;
 
 DECLARE_EVENT_TABLE()
   wxButton*         m_windowCloseButton; // Or OK
   wxButton*         m_windowCancelButton;
   wxButton*         m_windowHelpButton;
 
 DECLARE_EVENT_TABLE()

+private:
+  virtual void ShowView(wxPropertySheet *propertySheet, wxWindow *window)
+  { wxPropertyView::ShowView(propertySheet, window); };

 };
 
 class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl
 };
 
 class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl


@@ -206,7 +207,7 @@ class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl
 /*
  * The type of validator used for property lists (Visual Basic style)
  */
 /*
  * The type of validator used for property lists (Visual Basic style)
  */

- 
+

 class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)
 class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)


@@ -221,7 +222,7 @@ class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 
    // Called when the property is double clicked. Extra functionality can be provided, such as
    // cycling through possible values.
 
    // Called when the property is double clicked. Extra functionality can be provided, such as
    // cycling through possible values.

-   inline virtual bool OnDoubleClick( 
+   inline virtual bool OnDoubleClick(

      wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
      { return TRUE; }
 
      wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
      { return TRUE; }
 


@@ -268,7 +269,7 @@ class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 /*
  * A default dialog box class to use.
  */
 /*
  * A default dialog box class to use.
  */

- 
+

 class WXDLLEXPORT wxPropertyListDialog: public wxDialog
 {
   DECLARE_CLASS(wxPropertyListDialog)
 class WXDLLEXPORT wxPropertyListDialog: public wxDialog
 {
   DECLARE_CLASS(wxPropertyListDialog)


@@ -292,7 +293,7 @@ DECLARE_EVENT_TABLE()
 /*
  * A default panel class to use.
  */
 /*
  * A default panel class to use.
  */

- 
+

 class WXDLLEXPORT wxPropertyListPanel: public wxPanel
 {
   DECLARE_CLASS(wxPropertyListPanel)
 class WXDLLEXPORT wxPropertyListPanel: public wxPanel
 {
   DECLARE_CLASS(wxPropertyListPanel)


@@ -325,7 +326,7 @@ DECLARE_EVENT_TABLE()
 /*
  * A default frame class to use.
  */
 /*
  * A default frame class to use.
  */

- 
+

 class WXDLLEXPORT wxPropertyListFrame: public wxFrame
 {
   DECLARE_CLASS(wxPropertyListFrame)
 class WXDLLEXPORT wxPropertyListFrame: public wxFrame
 {
   DECLARE_CLASS(wxPropertyListFrame)


@@ -355,7 +356,7 @@ DECLARE_EVENT_TABLE()
 /*
  * Some default validators
  */
 /*
  * Some default validators
  */

- 
+

 class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)
 class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)


@@ -472,7 +473,7 @@ class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator
  protected:
   wxStringList*     m_strings;
 };
  protected:
   wxStringList*     m_strings;
 };

- 
+

 class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
 class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)


@@ -501,7 +502,7 @@ class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
  protected:
   wxString  m_filenameWildCard;
   wxString  m_filenameMessage;
  protected:
   wxString  m_filenameWildCard;
   wxString  m_filenameMessage;

-  
+

 };
 
 class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator
 };
 
 class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator


@@ -551,7 +552,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 char *title = "String List Editor");
+   bool EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title = T("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);