added support disabled tag for toolbar elements in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -76,6 +76,7 @@ All (GUI):
|
|||||||
- Added SetSheetStyle to wxPropertySheetDialog and allowed it to
|
- Added SetSheetStyle to wxPropertySheetDialog and allowed it to
|
||||||
behave like a Mac OS X settings dialog.
|
behave like a Mac OS X settings dialog.
|
||||||
- wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated.
|
- wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated.
|
||||||
|
- Added <disabled> XRC tag for wxToolBar elements
|
||||||
|
|
||||||
wxMSW:
|
wxMSW:
|
||||||
|
|
||||||
|
@@ -457,6 +457,7 @@ appear within wxToolBar node. Their attributes are as follows:
|
|||||||
bitmap2 Bitmap wxNullBitmap
|
bitmap2 Bitmap wxNullBitmap
|
||||||
toggle Boolean 0
|
toggle Boolean 0
|
||||||
radio Boolean 0
|
radio Boolean 0
|
||||||
|
disabled Boolean 0
|
||||||
label I18nString ""
|
label I18nString ""
|
||||||
tooltip I18nString ""
|
tooltip I18nString ""
|
||||||
longhelp I18nString ""
|
longhelp I18nString ""
|
||||||
|
@@ -76,6 +76,9 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
|
|||||||
kind,
|
kind,
|
||||||
GetText(wxT("tooltip")),
|
GetText(wxT("tooltip")),
|
||||||
GetText(wxT("longhelp")));
|
GetText(wxT("longhelp")));
|
||||||
|
|
||||||
|
if ( GetBool(wxT("disabled")) )
|
||||||
|
m_toolbar->EnableTool(GetID(), false);
|
||||||
}
|
}
|
||||||
return m_toolbar; // must return non-NULL
|
return m_toolbar; // must return non-NULL
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user