X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3a43801df2f05c057892481df9d3cfe30fd8800..9390a202a8b9d67d393faf3e1323885e6a27c127:/include/wx/proplist.h

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index 66f1a3c40c..a18213ae87 100644
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -57,7 +57,9 @@
 #define wxPROP_PULLDOWN           64
 #define wxPROP_SHOWVALUES         128
 
-#ifdef __XVIEW__
+// Show OK/Cancel buttons on X-based systems where window management is
+// more awkward
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
 #define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL | wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN
 #else
 #define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN | wxPROP_SHOWVALUES
@@ -71,7 +73,7 @@
 #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:
@@ -186,7 +188,7 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
-class wxPropertyTextEdit: public wxTextCtrl
+class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl
 {
  DECLARE_CLASS(wxPropertyTextEdit)
  public:
@@ -205,7 +207,7 @@ class wxPropertyTextEdit: public wxTextCtrl
  * 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:
@@ -267,7 +269,7 @@ class wxPropertyListValidator: public wxPropertyValidator
  * A default dialog box class to use.
  */
  
-class wxPropertyListDialog: public wxDialog
+class WXDLLEXPORT wxPropertyListDialog: public wxDialog
 {
   DECLARE_CLASS(wxPropertyListDialog)
  public:
@@ -291,7 +293,7 @@ DECLARE_EVENT_TABLE()
  * A default panel class to use.
  */
  
-class wxPropertyListPanel: public wxPanel
+class WXDLLEXPORT wxPropertyListPanel: public wxPanel
 {
   DECLARE_CLASS(wxPropertyListPanel)
  public:
@@ -324,13 +326,13 @@ DECLARE_EVENT_TABLE()
  * A default frame class to use.
  */
  
-class wxPropertyListFrame: public wxFrame
+class WXDLLEXPORT wxPropertyListFrame: public wxFrame
 {
   DECLARE_CLASS(wxPropertyListFrame)
  public:
   wxPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    long style = wxDEFAULT_FRAME, const wxString& name = "frame"):
+    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
      wxFrame(parent, -1, title, pos, size, style, name)
   {
     m_view = v;
@@ -352,7 +354,7 @@ class wxPropertyListFrame: public wxFrame
  * Some default validators
  */
  
-class wxRealListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)
  public:
@@ -379,7 +381,7 @@ class wxRealListValidator: public wxPropertyListValidator
   float     m_realMax;
 };
 
-class wxIntegerListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxIntegerListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxIntegerListValidator)
  public:
@@ -406,7 +408,7 @@ class wxIntegerListValidator: public wxPropertyListValidator
   long m_integerMax;
 };
 
-class wxBoolListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxBoolListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxBoolListValidator)
  protected:
@@ -435,7 +437,7 @@ class wxBoolListValidator: public wxPropertyListValidator
    virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 
-class wxStringListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxStringListValidator)
  public:
@@ -469,7 +471,7 @@ class wxStringListValidator: public wxPropertyListValidator
   wxStringList*     m_strings;
 };
  
-class wxFilenameListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
  public:
@@ -500,7 +502,7 @@ class wxFilenameListValidator: public wxPropertyListValidator
   
 };
 
-class wxColourListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxColourListValidator)
  protected:
@@ -521,7 +523,7 @@ class wxColourListValidator: public wxPropertyListValidator
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 
-class wxListOfStringsListValidator: public wxPropertyListValidator
+class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxListOfStringsListValidator)
  protected: