* Fixed updating in non-INSTANT_UPDATE mode.
* should now build correctly with Dano, R5, Haiku, and libbe_test targets. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14811 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -41,8 +41,6 @@ extern status_t _get_system_default_font_(const char* which,
|
|||||||
font_family family, font_style style, float* _size);
|
font_family family, font_style style, float* _size);
|
||||||
|
|
||||||
|
|
||||||
#ifndef __HAIKU__
|
|
||||||
|
|
||||||
#ifdef B_BEOS_VERSION_DANO
|
#ifdef B_BEOS_VERSION_DANO
|
||||||
// this call only exists under R5
|
// this call only exists under R5
|
||||||
void
|
void
|
||||||
@@ -52,7 +50,9 @@ _set_system_font_(const char *which, font_family family,
|
|||||||
puts("you don't have _set_system_font_()");
|
puts("you don't have _set_system_font_()");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/*
|
|
||||||
|
#if !defined(HAIKU_TARGET_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
|
||||||
|
// this call only exists under Haiku (and the test environment)
|
||||||
status_t
|
status_t
|
||||||
_get_system_default_font_(const char* which, font_family family,
|
_get_system_default_font_(const char* which, font_family family,
|
||||||
font_style style, float* _size)
|
font_style style, float* _size)
|
||||||
@@ -60,8 +60,10 @@ _get_system_default_font_(const char* which, font_family family,
|
|||||||
puts("you don't have _get_system_default_font_()");
|
puts("you don't have _get_system_default_font_()");
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
}
|
}
|
||||||
*/
|
#endif
|
||||||
#endif // !__HAIKU__
|
|
||||||
|
|
||||||
|
// #pragma mark -
|
||||||
|
|
||||||
|
|
||||||
FontSelectionView::FontSelectionView(BRect rect, const char* name,
|
FontSelectionView::FontSelectionView(BRect rect, const char* name,
|
||||||
@@ -121,7 +123,7 @@ FontSelectionView::FontSelectionView(BRect rect, const char* name,
|
|||||||
|
|
||||||
FontSelectionView::~FontSelectionView()
|
FontSelectionView::~FontSelectionView()
|
||||||
{
|
{
|
||||||
#ifdef INSTANT_UPDATE
|
#ifndef INSTANT_UPDATE
|
||||||
_UpdateSystemFont();
|
_UpdateSystemFont();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user