i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BControl subclasses: Override SetIcon()

Browse Source 
... and implement Perform() action for potential later use.
This commit is contained in:
Ingo Weinhold
2013-12-22 02:48:27 +01:00
parent be260374d5
commit be4367428b
16 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Button.cpp
+12
View File
@@ -661,6 +661,11 @@ BButton::Perform(perform_code code, void* _data)
BButton::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BButton::SetIcon(data->icon, data->flags);
}
}
return BControl::Perform(code, _data);
@@ -691,6 +696,13 @@ BButton::PreferredSize()
}
status_t
BButton::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
void
BButton::LayoutInvalidated(bool descendants)
{
src/kits/interface/CheckBox.cpp
+12
View File
@@ -589,12 +589,24 @@ BCheckBox::Perform(perform_code code, void* _data)
BCheckBox::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BCheckBox::SetIcon(data->icon, data->flags);
}
}
return BControl::Perform(code, _data);
}
status_t
BCheckBox::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
void
BCheckBox::LayoutInvalidated(bool descendants)
{
src/kits/interface/ColorControl.cpp
+12
View File
@@ -1036,6 +1036,13 @@ BColorControl::AllDetached()
}
status_t
BColorControl::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
status_t
BColorControl::Perform(perform_code code, void* _data)
{
@@ -1086,6 +1093,11 @@ BColorControl::Perform(perform_code code, void* _data)
BColorControl::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BColorControl::SetIcon(data->icon, data->flags);
}
}
return BControl::Perform(code, _data);
src/kits/interface/PictureButton.cpp
+12
View File
@@ -470,12 +470,24 @@ BPictureButton::Perform(perform_code code, void* _data)
BPictureButton::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BPictureButton::SetIcon(data->icon, data->flags);
}
}
return BControl::Perform(code, _data);
}
status_t
BPictureButton::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
// #pragma mark -
src/kits/interface/RadioButton.cpp
+11
View File
@@ -555,6 +555,11 @@ BRadioButton::Perform(perform_code code, void* _data)
BRadioButton::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BRadioButton::SetIcon(data->icon, data->flags);
}
}
return BControl::Perform(code, _data);
@@ -580,6 +585,12 @@ BRadioButton::LayoutAlignment()
}
status_t
BRadioButton::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
void BRadioButton::_ReservedRadioButton1() {}
void BRadioButton::_ReservedRadioButton2() {}
src/kits/interface/Slider.cpp
+12
View File
@@ -345,6 +345,11 @@ BSlider::Perform(perform_code code, void* _data)
BSlider::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BSlider::SetIcon(data->icon, data->flags);
}
}
return BControl::Perform(code, _data);
@@ -1768,6 +1773,13 @@ BSlider::PreferredSize()
}
status_t
BSlider::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
void
BSlider::LayoutInvalidated(bool descendants)
{
src/kits/interface/TextControl.cpp
+13 -1
View File
@@ -947,6 +947,13 @@ BTextControl::DoLayout()
}
status_t
BTextControl::SetIcon(const BBitmap* icon, uint32 flags)
{
return BControl::SetIcon(icon, flags);
}
// #pragma mark -
@@ -981,7 +988,7 @@ BTextControl::Perform(perform_code code, void* _data)
BTextControl::GetHeightForWidth(data->width, &data->min, &data->max,
&data->preferred);
return B_OK;
}
}
case PERFORM_CODE_SET_LAYOUT:
{
perform_data_set_layout* data = (perform_data_set_layout*)_data;
@@ -1000,6 +1007,11 @@ BTextControl::Perform(perform_code code, void* _data)
BTextControl::DoLayout();
return B_OK;
}
case PERFORM_CODE_SET_ICON:
{
perform_data_set_icon* data = (perform_data_set_icon*)_data;
return BTextControl::SetIcon(data->icon, data->flags);
}
case PERFORM_CODE_ALL_UNARCHIVED:
{
perform_data_all_unarchived* data
src/kits/shared/IconButton.cpp
+1 -1
View File
@@ -382,7 +382,7 @@ BIconButton::SetIcon(const char* pathToBitmap)
status_t
BIconButton::SetIcon(const BBitmap* bitmap)
BIconButton::SetIcon(const BBitmap* bitmap, uint32 flags)
{
if (bitmap && bitmap->ColorSpace() == B_CMAP8) {
status_t status = bitmap->InitCheck();