[haiku-commits] haiku: hrev43790 - src/kits/interface
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 26 Feb 2012 10:39:04 +0100 (CET)
hrev43790 adds 1 changeset to branch 'master'
old head: 44c991efdbdfac7aeeb8872d6ec4329589eed9c8
new head: 8adaa6c54487cab1d200592bb2d5aca44ba2039b
----------------------------------------------------------------------------
8adaa6c: interface kit: added compatibility symbols for GCC4
* InvalidateLayout method for BBox, BButton, BCheckBox, BMenuField,
BScrollView, BSlider, BStringView, BTextControl.
[ Jerome Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43790
Commit: 8adaa6c54487cab1d200592bb2d5aca44ba2039b
URL: http://cgit.haiku-os.org/haiku/commit/?id=8adaa6c
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Sun Feb 26 09:36:04 2012 UTC
----------------------------------------------------------------------------
8 files changed, 19 insertions(+), 44 deletions(-)
src/kits/interface/Box.cpp | 8 ++------
src/kits/interface/Button.cpp | 8 ++------
src/kits/interface/CheckBox.cpp | 8 ++------
src/kits/interface/MenuField.cpp | 8 ++------
src/kits/interface/ScrollView.cpp | 8 ++------
src/kits/interface/Slider.cpp | 7 +++++--
src/kits/interface/StringView.cpp | 8 ++------
src/kits/interface/TextControl.cpp | 8 ++------
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Box.cpp b/src/kits/interface/Box.cpp
index a78dde6..e75e202 100644
--- a/src/kits/interface/Box.cpp
+++ b/src/kits/interface/Box.cpp
@@ -874,11 +874,9 @@ BBox::_ValidateLayoutData()
}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__4BBoxb(BBox* box, bool descendants)
+B_IF_GCC_2(InvalidateLayout__4BBoxb, _ZN4BBox16InvalidateLayoutEb)(
+ BBox* box, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -886,5 +884,3 @@ InvalidateLayout__4BBoxb(BBox* box, bool descendants)
box->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
diff --git a/src/kits/interface/Button.cpp b/src/kits/interface/Button.cpp
index b1fe074..87f85a3 100644
--- a/src/kits/interface/Button.cpp
+++ b/src/kits/interface/Button.cpp
@@ -781,11 +781,9 @@ BButton::_DrawFocusLine(float x, float y, float width,
bool visible)
}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__7BButtonb(BView* view, bool descendants)
+B_IF_GCC_2(InvalidateLayout__7BButtonb, _ZN7BButton16InvalidateLayoutEb)(
+ BView* view, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -793,5 +791,3 @@ InvalidateLayout__7BButtonb(BView* view, bool descendants)
view->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
diff --git a/src/kits/interface/CheckBox.cpp b/src/kits/interface/CheckBox.cpp
index f247587..2501327 100644
--- a/src/kits/interface/CheckBox.cpp
+++ b/src/kits/interface/CheckBox.cpp
@@ -624,11 +624,9 @@ BCheckBox::operator=(const BCheckBox &)
}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__9BCheckBoxb(BCheckBox* box, bool descendants)
+B_IF_GCC_2(InvalidateLayout__9BCheckBoxb, _ZN9BCheckBox16InvalidateLayoutEb)(
+ BCheckBox* box, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -636,5 +634,3 @@ InvalidateLayout__9BCheckBoxb(BCheckBox* box, bool
descendants)
box->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
diff --git a/src/kits/interface/MenuField.cpp b/src/kits/interface/MenuField.cpp
index 65d45c9..cf261ab 100644
--- a/src/kits/interface/MenuField.cpp
+++ b/src/kits/interface/MenuField.cpp
@@ -1511,11 +1511,9 @@ BMenuField::MenuBarLayoutItem::Instantiate(BMessage*
from)
}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__10BMenuFieldb(BMenuField* field, bool descendants)
+B_IF_GCC_2(InvalidateLayout__10BMenuFieldb,
_ZN10BMenuField16InvalidateLayoutEb)(
+ BMenuField* field, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -1523,5 +1521,3 @@ InvalidateLayout__10BMenuFieldb(BMenuField* field, bool
descendants)
field->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
diff --git a/src/kits/interface/ScrollView.cpp
b/src/kits/interface/ScrollView.cpp
index 9baa502..ff26129 100644
--- a/src/kits/interface/ScrollView.cpp
+++ b/src/kits/interface/ScrollView.cpp
@@ -898,11 +898,9 @@ void BScrollView::_ReservedScrollView3() {}
void BScrollView::_ReservedScrollView4() {}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__11BScrollViewb(BScrollView* view, bool descendants)
+B_IF_GCC_2(InvalidateLayout__11BScrollViewb,
+ _ZN11BScrollView16InvalidateLayoutEb)(BScrollView* view, bool
descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -910,5 +908,3 @@ InvalidateLayout__11BScrollViewb(BScrollView* view, bool
descendants)
view->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
diff --git a/src/kits/interface/Slider.cpp b/src/kits/interface/Slider.cpp
index 1356c17..063c52b 100644
--- a/src/kits/interface/Slider.cpp
+++ b/src/kits/interface/Slider.cpp
@@ -2230,8 +2230,12 @@ _ReservedSlider3__7BSlider(BSlider* slider, const BFont*
font,
}
+#endif // __GNUC__ < 3
+
+
extern "C" void
-InvalidateLayout__7BSliderb(BView* view, bool descendants)
+B_IF_GCC_2(InvalidateLayout__7BSliderb, _ZN7BSlider16InvalidateLayoutEb)(
+ BView* view, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -2239,4 +2243,3 @@ InvalidateLayout__7BSliderb(BView* view, bool descendants)
view->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-#endif // __GNUC__ < 3
diff --git a/src/kits/interface/StringView.cpp
b/src/kits/interface/StringView.cpp
index 6045365..5035923 100644
--- a/src/kits/interface/StringView.cpp
+++ b/src/kits/interface/StringView.cpp
@@ -454,11 +454,9 @@ BStringView::_ValidatePreferredSize()
}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__11BStringViewb(BView* view, bool descendants)
+B_IF_GCC_2(InvalidateLayout__11BStringViewb,
+ _ZN11BStringView16InvalidateLayoutEb)(BView* view, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -466,5 +464,3 @@ InvalidateLayout__11BStringViewb(BView* view, bool
descendants)
view->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
diff --git a/src/kits/interface/TextControl.cpp
b/src/kits/interface/TextControl.cpp
index e2572c5..f0f64f4 100644
--- a/src/kits/interface/TextControl.cpp
+++ b/src/kits/interface/TextControl.cpp
@@ -1480,11 +1480,9 @@ BTextControl::TextViewLayoutItem::Instantiate(BMessage*
from)
}
-#if __GNUC__ == 2
-
-
extern "C" void
-InvalidateLayout__12BTextControlb(BView* view, bool descendants)
+B_IF_GCC_2(InvalidateLayout__12BTextControlb,
+ _ZN12BTextControl16InvalidateLayoutEb)(BView* view, bool descendants)
{
perform_data_layout_invalidated data;
data.descendants = descendants;
@@ -1492,5 +1490,3 @@ InvalidateLayout__12BTextControlb(BView* view, bool
descendants)
view->Perform(PERFORM_CODE_LAYOUT_INVALIDATED, &data);
}
-
-#endif
Other related posts:
- » [haiku-commits] haiku: hrev43790 - src/kits/interface - korli
