X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a3bdee6a979146c426cd058e9bfe6b58135b124..e8332ccfe0cf1653b257d46d5c41339e2b2da438:/contrib/include/wx/deprecated/proplist.h diff --git a/contrib/include/wx/deprecated/proplist.h b/contrib/include/wx/deprecated/proplist.h index 02c874e532..9c24cca4d0 100644 --- a/contrib/include/wx/deprecated/proplist.h +++ b/contrib/include/wx/deprecated/proplist.h @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* @@ -78,7 +78,7 @@ #define wxID_PROP_VALUE_SELECT 3005 // Mediates between a physical panel and the property sheet -class WXDLLEXPORT wxPropertyListView: public wxPropertyView +class WXDLLIMPEXP_DEPRECATED wxPropertyListView: public wxPropertyView { public: wxPropertyListView(wxPanel *propPanel = NULL, long flags = wxPROP_BUTTON_DEFAULT); @@ -97,14 +97,14 @@ public: virtual bool UpdatePropertyDisplayInList(wxProperty *property); // Update the whole list - virtual bool UpdatePropertyList(bool clearEditArea = TRUE); + virtual bool UpdatePropertyList(bool clearEditArea = true); // Find the wxListBox index corresponding to this property virtual int FindListIndexForProperty(wxProperty *property); // Select and show string representation in editor the given // property. NULL resets to show no property. - virtual bool ShowProperty(wxProperty *property, bool select = TRUE); + virtual bool ShowProperty(wxProperty *property, bool select = true); virtual bool EditProperty(wxProperty *property); // Update the display from the property @@ -190,17 +190,17 @@ public: private: DECLARE_DYNAMIC_CLASS(wxPropertyListView) DECLARE_EVENT_TABLE() - + virtual void ShowView(wxPropertySheet *propertySheet, wxWindow *window) { wxPropertyView::ShowView(propertySheet, window); }; }; -class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl +class WXDLLIMPEXP_DEPRECATED wxPropertyTextEdit: public wxTextCtrl { public: wxPropertyTextEdit(wxPropertyListView *v = NULL, wxWindow *parent = NULL, - const wxWindowID id = -1, + const wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -222,7 +222,7 @@ private: * The type of validator used for property lists (Visual Basic style) */ -class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator +class WXDLLIMPEXP_DEPRECATED wxPropertyListValidator: public wxPropertyValidator { public: wxPropertyListValidator(long flags = wxPROP_ALLOW_TEXT_EDITING): wxPropertyValidator(flags) { } @@ -236,7 +236,7 @@ public: // cycling through possible values. inline virtual bool OnDoubleClick( wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) - { return TRUE; } + { return true; } // Called when the value listbox is selected. Default behaviour is to copy // string to text control, and retrieve the value into the property. @@ -245,19 +245,19 @@ public: // Called when the property value is edited using standard text control inline virtual bool OnPrepareControls( wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) - { return TRUE; } + { return true; } virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when the property is edited in detail inline virtual bool OnPrepareDetailControls( wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) - { return TRUE; } + { return true; } // Called if focus lost, IF we're in a modeless property editing situation. inline virtual bool OnClearDetailControls( wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) - { return TRUE; } + { return true; } // Called when the edit (...) button is pressed. The default implementation // calls view->BeginDetailedEditing; the filename validator (for example) overrides @@ -265,10 +265,10 @@ public: virtual void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. inline virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) - { return TRUE; } + { return true; } // Called when TICK is pressed or focus is lost or view wants to update // the property list. @@ -276,7 +276,7 @@ public: virtual bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); virtual bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); - + private: DECLARE_DYNAMIC_CLASS(wxPropertyListValidator) }; @@ -285,7 +285,7 @@ private: * A default dialog box class to use. */ -class WXDLLEXPORT wxPropertyListDialog: public wxDialog +class WXDLLIMPEXP_DEPRECATED wxPropertyListDialog: public wxDialog { public: wxPropertyListDialog(wxPropertyListView *v = NULL, @@ -315,7 +315,7 @@ private: * A default panel class to use. */ -class WXDLLEXPORT wxPropertyListPanel: public wxPanel +class WXDLLIMPEXP_DEPRECATED wxPropertyListPanel: public wxPanel { public: wxPropertyListPanel(wxPropertyListView *v = NULL, @@ -324,7 +324,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("panel")) - : wxPanel(parent, -1, pos, size, style, name) + : wxPanel(parent, wxID_ANY, pos, size, style, name) { m_view = v; } @@ -352,7 +352,7 @@ private: * A default frame class to use. */ -class WXDLLEXPORT wxPropertyListFrame: public wxFrame +class WXDLLIMPEXP_DEPRECATED wxPropertyListFrame: public wxFrame { public: wxPropertyListFrame(wxPropertyListView *v = NULL, @@ -362,7 +362,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = _T("frame")) - : wxFrame(parent, -1, title, pos, size, style, name) + : wxFrame(parent, wxID_ANY, title, pos, size, style, name) { m_view = v; m_propertyPanel = NULL; @@ -388,7 +388,7 @@ private: * Some default validators */ -class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxRealListValidator: public wxPropertyListValidator { public: // 0.0, 0.0 means no range @@ -399,7 +399,7 @@ public: bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost or view wants to update @@ -410,12 +410,12 @@ public: protected: float m_realMin; float m_realMax; - + private: DECLARE_DYNAMIC_CLASS(wxRealListValidator) }; -class WXDLLEXPORT wxIntegerListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxIntegerListValidator: public wxPropertyListValidator { public: // 0, 0 means no range @@ -428,7 +428,7 @@ public: bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost or view wants to update @@ -439,12 +439,12 @@ public: protected: long m_integerMin; long m_integerMax; - + private: DECLARE_DYNAMIC_CLASS(wxIntegerListValidator) }; -class WXDLLEXPORT wxBoolListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxBoolListValidator: public wxPropertyListValidator { public: wxBoolListValidator(long flags = 0):wxPropertyListValidator(flags) {} @@ -455,7 +455,7 @@ public: bool OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost or view wants to update @@ -467,12 +467,12 @@ public: // Called when the property is double clicked. Extra functionality can be provided, // cycling through possible values. virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); - + private: DECLARE_DYNAMIC_CLASS(wxBoolListValidator) }; -class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxStringListValidator: public wxPropertyListValidator { public: wxStringListValidator(wxStringList *list = NULL, long flags = 0); @@ -488,7 +488,7 @@ public: bool OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost or view wants to update @@ -503,19 +503,19 @@ public: protected: wxStringList* m_strings; - + private: DECLARE_DYNAMIC_CLASS(wxStringListValidator) }; -class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxFilenameListValidator: public wxPropertyListValidator { public: wxFilenameListValidator(wxString message = wxT("Select a file"), wxString wildcard = wxALL_FILES_PATTERN, long flags = 0); ~wxFilenameListValidator(); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost or view wants to update @@ -539,7 +539,7 @@ private: DECLARE_DYNAMIC_CLASS(wxFilenameListValidator) }; -class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxColourListValidator: public wxPropertyListValidator { public: wxColourListValidator(long flags = 0); @@ -555,12 +555,12 @@ public: // Called when the edit (...) button is pressed. void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); - + private: DECLARE_DYNAMIC_CLASS(wxColourListValidator) }; -class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxListOfStringsListValidator: public wxPropertyListValidator { public: wxListOfStringsListValidator(long flags = 0); @@ -569,7 +569,7 @@ public: bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost. - // Return FALSE if value didn't check out; signal to restore old value. + // Return false if value didn't check out; signal to restore old value. bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); // Called when TICK is pressed or focus is lost or view wants to update @@ -585,7 +585,7 @@ public: // Called when the edit (...) button is pressed. void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); - + private: DECLARE_DYNAMIC_CLASS(wxListOfStringsListValidator) };