Added sys/types.h needed for Solaris.

[wxWidgets.git] / utils / dialoged / src / winprop.h

diff --git a/utils/dialoged/src/winprop.h b/utils/dialoged/src/winprop.h
index d8a95cdd376b36d0ec4a68e6a47f669b08746617..8b4032a8a08215c7dfcdb2f91c2585e7d48292f3 100644 (file)
--- a/utils/dialoged/src/winprop.h
+++ b/utils/dialoged/src/winprop.h
@@ -20,14 +20,14 @@
 
 class wxPropertyInfo;
 
 
 class wxPropertyInfo;
 

-class wxDialogEditorPropertyListDialog: public wxPropertyListDialog
+class wxDialogEditorPropertyListFrame: public wxPropertyListFrame

 {
     friend class wxPropertyInfo;
 public:
 {
     friend class wxPropertyInfo;
 public:

-    wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
+    wxDialogEditorPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,

         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-        long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");
-    ~wxDialogEditorPropertyListDialog();
+        long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
+    ~wxDialogEditorPropertyListFrame();

 
 private:
     wxPropertySheet*            m_propSheet;
 
 private:
     wxPropertySheet*            m_propSheet;


@@ -57,7 +57,7 @@ class wxResourcePropertyListView: public wxPropertyListView
 // them with separate classes.
 class wxPropertyInfo: public wxObject
 {
 // them with separate classes.
 class wxPropertyInfo: public wxObject
 {

-    friend class wxDialogEditorPropertyListDialog;
+    friend class wxDialogEditorPropertyListFrame;

  protected:
   static wxWindow *sm_propertyWindow;
   wxPropertyInfo(void)
  protected:
   static wxWindow *sm_propertyWindow;
   wxPropertyInfo(void)


@@ -97,6 +97,9 @@ class wxWindowPropertyInfo: public wxPropertyInfo
   
   // Fill in the wxItemResource members to mirror the current window settings
   virtual bool InstantiateResource(wxItemResource *resource);
   
   // Fill in the wxItemResource members to mirror the current window settings
   virtual bool InstantiateResource(wxItemResource *resource);

+
+  // Set the window style
+  void SetWindowStyle(wxWindow* win, long style, bool set);

 };
 
 // For panel items
 };
 
 // For panel items


@@ -211,6 +214,20 @@ class wxChoicePropertyInfo: public wxItemPropertyInfo
   bool InstantiateResource(wxItemResource *resource);
 };
 
   bool InstantiateResource(wxItemResource *resource);
 };
 

+// For choice items
+class wxComboBoxPropertyInfo: public wxChoicePropertyInfo
+{
+ protected:
+ public:
+  wxComboBoxPropertyInfo(wxWindow *win, wxItemResource *res = NULL):
+    wxChoicePropertyInfo(win, res) {}
+  ~wxComboBoxPropertyInfo(void) {}
+  wxProperty *GetProperty(wxString& name);
+  bool SetProperty(wxString& name, wxProperty *property);
+  void GetPropertyNames(wxStringList& names);
+  bool InstantiateResource(wxItemResource *resource);
+};
+

 // For radiobox items
 class wxRadioBoxPropertyInfo: public wxItemPropertyInfo
 {
 // For radiobox items
 class wxRadioBoxPropertyInfo: public wxItemPropertyInfo
 {