Augmented version to b5

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

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index 59340b3977c4d4cfe2bdc6d0c82f0992de338a42..87a674b2a10d3d8a5163ea3b9d27d151c5ad42ef 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -73,7 +73,7 @@
 #define wxID_PROP_VALUE_SELECT  3005
 
 // Mediates between a physical panel and the property sheet
 #define wxID_PROP_VALUE_SELECT  3005
 
 // Mediates between a physical panel and the property sheet

-class wxPropertyListView: public wxPropertyView
+class WXDLLEXPORT wxPropertyListView: public wxPropertyView

 {
  DECLARE_DYNAMIC_CLASS(wxPropertyListView)
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxPropertyListView)
  public:


@@ -188,7 +188,7 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-class wxPropertyTextEdit: public wxTextCtrl
+class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl

 {
  DECLARE_CLASS(wxPropertyTextEdit)
  public:
 {
  DECLARE_CLASS(wxPropertyTextEdit)
  public:


@@ -207,7 +207,7 @@ class 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 wxPropertyListValidator: public wxPropertyValidator
+class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator

 {
   DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)
  protected:
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)
  protected:


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

-class wxPropertyListDialog: public wxDialog
+class WXDLLEXPORT wxPropertyListDialog: public wxDialog

 {
   DECLARE_CLASS(wxPropertyListDialog)
  public:
   wxPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");
 {
   DECLARE_CLASS(wxPropertyListDialog)
  public:
   wxPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");

-  bool OnClose(void);
+  void OnCloseWindow(wxCloseEvent& event);

   void OnDefaultAction(wxControl *item);
   void OnCancel(wxCommandEvent& event);
 
   void OnDefaultAction(wxControl *item);
   void OnCancel(wxCommandEvent& event);
 


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

-class wxPropertyListPanel: public wxPanel
+class WXDLLEXPORT wxPropertyListPanel: public wxPanel

 {
   DECLARE_CLASS(wxPropertyListPanel)
  public:
 {
   DECLARE_CLASS(wxPropertyListPanel)
  public:


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

-class wxPropertyListFrame: public wxFrame
+class WXDLLEXPORT wxPropertyListFrame: public wxFrame

 {
   DECLARE_CLASS(wxPropertyListFrame)
  public:
 {
   DECLARE_CLASS(wxPropertyListFrame)
  public:


@@ -338,7 +338,7 @@ class wxPropertyListFrame: public wxFrame
     m_view = v;
     m_propertyPanel = NULL;
   }
     m_view = v;
     m_propertyPanel = NULL;
   }

-  bool OnClose(void);
+  void OnCloseWindow(wxCloseEvent& event);

 
   // Must call this to create panel and associate view
   virtual bool Initialize(void);
 
   // Must call this to create panel and associate view
   virtual bool Initialize(void);


@@ -348,13 +348,15 @@ class wxPropertyListFrame: public wxFrame
  private:
   wxPropertyListView*       m_view;
   wxPropertyListPanel*      m_propertyPanel;
  private:
   wxPropertyListView*       m_view;
   wxPropertyListPanel*      m_propertyPanel;

+
+DECLARE_EVENT_TABLE()

 };
 
 /*
  * Some default validators
  */
  
 };
 
 /*
  * Some default validators
  */
  

-class wxRealListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)
  public:


@@ -381,7 +383,7 @@ class wxRealListValidator: public wxPropertyListValidator
   float     m_realMax;
 };
 
   float     m_realMax;
 };
 

-class wxIntegerListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxIntegerListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxIntegerListValidator)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxIntegerListValidator)
  public:


@@ -408,7 +410,7 @@ class wxIntegerListValidator: public wxPropertyListValidator
   long m_integerMax;
 };
 
   long m_integerMax;
 };
 

-class wxBoolListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxBoolListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxBoolListValidator)
  protected:
 {
   DECLARE_DYNAMIC_CLASS(wxBoolListValidator)
  protected:


@@ -437,7 +439,7 @@ class wxBoolListValidator: public wxPropertyListValidator
    virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 
    virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 

-class wxStringListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxStringListValidator)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxStringListValidator)
  public:


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

-class wxFilenameListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
  public:


@@ -502,7 +504,7 @@ class wxFilenameListValidator: public wxPropertyListValidator
   
 };
 
   
 };
 

-class wxColourListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxColourListValidator)
  protected:
 {
   DECLARE_DYNAMIC_CLASS(wxColourListValidator)
  protected:


@@ -523,7 +525,7 @@ class wxColourListValidator: public wxPropertyListValidator
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 

-class wxListOfStringsListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator

 {
   DECLARE_DYNAMIC_CLASS(wxListOfStringsListValidator)
  protected:
 {
   DECLARE_DYNAMIC_CLASS(wxListOfStringsListValidator)
  protected:


@@ -549,7 +551,7 @@ class 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);