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

fixed some Archive() following stippi's path

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17188 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-04-21 11:21:53 +00:00
parent 3a8e8e427b
commit 11d7ecebd0
3 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Slider.cpp
+30 -26
View File
@@ -241,40 +241,44 @@ BSlider::Instantiate(BMessage *archive)
status_t status_t
BSlider::Archive(BMessage *archive, bool deep) const BSlider::Archive(BMessage *archive, bool deep) const
{ {
BControl::Archive(archive, deep); status_t ret = BControl::Archive(archive, deep);
if (ModificationMessage()) if (ModificationMessage() && ret == B_OK)
archive->AddMessage("_mod_msg", ModificationMessage()); ret = archive->AddMessage("_mod_msg", ModificationMessage());
archive->AddInt32("_sdelay", fSnoozeAmount); if (ret == B_OK)
ret = archive->AddInt32("_sdelay", fSnoozeAmount);
if (ret == B_OK)
ret = archive->AddInt32("_bcolor", _color_to_long_(fBarColor));
archive->AddInt32("_bcolor", _color_to_long_(fBarColor)); if (FillColor(NULL) && ret == B_OK)
ret = archive->AddInt32("_fcolor", _color_to_long_(fFillColor));
if (FillColor(NULL)) if (ret == B_OK && fMinLimitLabel)
archive->AddInt32("_fcolor", _color_to_long_(fFillColor)); ret = archive->AddString("_minlbl", fMinLimitLabel);
if (fMinLimitLabel) if (ret == B_OK && fMaxLimitLabel)
archive->AddString("_minlbl", fMinLimitLabel); ret = archive->AddString("_maxlbl", fMaxLimitLabel);
if (fMaxLimitLabel) if (ret == B_OK)
archive->AddString("_maxlbl", fMaxLimitLabel); ret = archive->AddInt32("_min", fMinValue);
if (ret == B_OK)
ret = archive->AddInt32("_max", fMaxValue);
archive->AddInt32("_min", fMinValue); if (ret == B_OK)
archive->AddInt32("_max", fMaxValue); ret = archive->AddInt32("_incrementvalue", fKeyIncrementValue);
if (ret == B_OK)
ret = archive->AddInt32("_hashcount", fHashMarkCount);
if (ret == B_OK)
ret = archive->AddInt16("_hashloc", fHashMarks);
if (ret == B_OK)
ret = archive->AddInt16("_sstyle", fStyle);
if (ret == B_OK)
ret = archive->AddInt32("_orient", fOrientation);
if (ret == B_OK)
ret = archive->AddFloat("_bthickness", fBarThickness);
archive->AddInt32("_incrementvalue", fKeyIncrementValue); return ret;
archive->AddInt32("_hashcount", fHashMarkCount);
archive->AddInt16("_hashloc", fHashMarks);
archive->AddInt16("_sstyle", fStyle);
archive->AddInt32("_orient", fOrientation);
archive->AddFloat("_bthickness", fBarThickness);
return B_OK;
} }
src/kits/interface/TabView.cpp
+15 -12
View File
@@ -402,30 +402,33 @@ BTabView::Archive(BMessage *archive, bool deep) const
if (CountTabs() > 0) if (CountTabs() > 0)
TabAt(Selection())->View()->RemoveSelf(); TabAt(Selection())->View()->RemoveSelf();
BView::Archive(archive, deep); status_t ret = BView::Archive(archive, deep);
archive->AddInt16("_but_width", fTabWidthSetting); if (ret == B_OK)
archive->AddFloat("_high", fTabHeight); ret = archive->AddInt16("_but_width", fTabWidthSetting);
archive->AddInt32("_sel", fSelection); if (ret == B_OK)
ret = archive->AddFloat("_high", fTabHeight);
if (ret == B_OK)
ret = archive->AddInt32("_sel", fSelection);
if (deep) { if (ret == B_OK && deep) {
for (int32 i = 0; i < CountTabs(); i++) { for (int32 i = 0; i < CountTabs(); i++) {
BMessage tabArchive; BMessage tabArchive;
BTab *tab = TabAt(i); BTab *tab = TabAt(i);
if (!tab) if (!tab)
continue; continue;
ret = tab->Archive(&tabArchive, true);
if (tab->Archive(&tabArchive, true) == B_OK) if (ret == B_OK)
archive->AddMessage("_l_items", &tabArchive); ret = archive->AddMessage("_l_items", &tabArchive);
if (!tab->View()) if (!tab->View())
continue; continue;
BMessage viewArchive; BMessage viewArchive;
ret = tab->View()->Archive(&viewArchive, true);
if (tab->View()->Archive(&viewArchive, true) == B_OK) if (ret == B_OK)
archive->AddMessage("_view_list", &viewArchive); ret = archive->AddMessage("_view_list", &viewArchive);
} }
} }
@@ -434,7 +437,7 @@ BTabView::Archive(BMessage *archive, bool deep) const
TabAt(Selection())->Select(ContainerView()); TabAt(Selection())->Select(ContainerView());
} }
return B_OK; return ret;
} }
src/kits/interface/TextControl.cpp
+10 -8
View File
@@ -86,20 +86,22 @@ BTextControl::Instantiate(BMessage *archive)
status_t status_t
BTextControl::Archive(BMessage *data, bool deep) const BTextControl::Archive(BMessage *data, bool deep) const
{ {
BView::Archive(data, deep); status_t ret = BView::Archive(data, deep);
alignment labelAlignment, textAlignment; alignment labelAlignment, textAlignment;
GetAlignment(&labelAlignment, &textAlignment); GetAlignment(&labelAlignment, &textAlignment);
data->AddInt32("_a_label", labelAlignment); if (ret == B_OK)
data->AddInt32("_a_text", textAlignment); ret = data->AddInt32("_a_label", labelAlignment);
data->AddFloat("_divide", Divider()); if (ret == B_OK)
ret = data->AddInt32("_a_text", textAlignment);
if (ret == B_OK)
ret = data->AddFloat("_divide", Divider());
if (ModificationMessage()) if (ModificationMessage() && (ret == B_OK))
data->AddMessage("_mod_msg", ModificationMessage()); ret = data->AddMessage("_mod_msg", ModificationMessage());
return B_OK; return ret;
} }