Revert some changes from incorrect merge that discarded formatting, etc.
This commit is contained in:
@@ -106,7 +106,7 @@ public:
|
||||
virtual void Init();
|
||||
|
||||
/**
|
||||
Return false here to indicate unhandled events should be
|
||||
Return @false here to indicate unhandled events should be
|
||||
propagated to manager's parent, as normal.
|
||||
*/
|
||||
virtual bool IsHandlingAllEvents() const;
|
||||
@@ -231,7 +231,9 @@ public:
|
||||
long style = wxPGMAN_DEFAULT_STYLE,
|
||||
const wxString& name = wxPropertyGridManagerNameStr );
|
||||
|
||||
/** Destructor */
|
||||
/**
|
||||
Destructor.
|
||||
*/
|
||||
virtual ~wxPropertyGridManager();
|
||||
|
||||
/**
|
||||
@@ -293,7 +295,7 @@ public:
|
||||
Enables or disables (shows/hides) categories according to parameter enable.
|
||||
|
||||
@remarks
|
||||
Calling his may not properly update toolbar buttons.
|
||||
Calling this may not properly update toolbar buttons.
|
||||
*/
|
||||
bool EnableCategories( bool enable );
|
||||
|
||||
@@ -325,7 +327,7 @@ public:
|
||||
wxPropertyGrid* GetGrid();
|
||||
|
||||
/**
|
||||
Similar to GetIterator, but instead returns wxPGVIterator instance,
|
||||
Similar to GetIterator(), but instead returns wxPGVIterator instance,
|
||||
which can be useful for forward-iterating through arbitrary property
|
||||
containers.
|
||||
*/
|
||||
@@ -405,7 +407,7 @@ public:
|
||||
|
||||
@param pageObj
|
||||
wxPropertyGridPage instance. Manager will take ownership of this
|
||||
object. If NULL, default page object is constructed.
|
||||
object. If @NULL, default page object is constructed.
|
||||
|
||||
@return Returns pointer to created page.
|
||||
*/
|
||||
@@ -445,7 +447,7 @@ public:
|
||||
Select and displays a given page.
|
||||
|
||||
@param index
|
||||
Index of page being seleced. Can be -1 to select nothing.
|
||||
Index of page being selected. Can be -1 to select nothing.
|
||||
*/
|
||||
void SelectPage( int index );
|
||||
|
||||
|
Reference in New Issue
Block a user