No longer use semi-static IDs for wxPropertyGrid embedded controls and tool bar tools.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-12-27 11:17:40 +00:00
parent a46cbd24b4
commit 538f4dd82b
2 changed files with 123 additions and 110 deletions

View File

@@ -128,7 +128,7 @@ public:
*/
int GetToolId() const
{
return m_id;
return m_toolId;
}
/** Do any member initialization in this method.
@@ -176,7 +176,9 @@ protected:
wxPropertyGridManager* m_manager;
int m_id; // toolbar index
// Toolbar tool id. Note that this is only valid when the tool bar
// exists.
int m_toolId;
private:
bool m_isDefault; // is this base page object?
@@ -688,15 +690,15 @@ protected:
int m_splitterHeight;
int m_nextTbInd;
int m_dragOffset;
wxCursor m_cursorSizeNS;
int m_nextDescBoxSize;
wxWindowID m_baseId;
// Toolbar tool ids for categorized and alphabetic mode selectors.
int m_categorizedModeToolId;
int m_alphabeticModeToolId;
unsigned char m_dragStatus;