BAboutWindow: Put the AboutView and StripeView into BPrivate.
To avoid name clashes. Possibly fixes the HaikuDepot crashes.
This commit is contained in:
@@ -15,7 +15,9 @@
|
|||||||
#include <View.h>
|
#include <View.h>
|
||||||
|
|
||||||
|
|
||||||
|
namespace BPrivate {
|
||||||
class AboutView;
|
class AboutView;
|
||||||
|
}
|
||||||
class BBitmap;
|
class BBitmap;
|
||||||
class BPoint;
|
class BPoint;
|
||||||
|
|
||||||
@@ -72,7 +74,7 @@ private:
|
|||||||
virtual void _ReservedAboutWindow1();
|
virtual void _ReservedAboutWindow1();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AboutView* fAboutView;
|
BPrivate::AboutView* fAboutView;
|
||||||
|
|
||||||
// FBC Padding
|
// FBC Padding
|
||||||
uint32 _reserved[20];
|
uint32 _reserved[20];
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ using BPrivate::gSystemCatalog;
|
|||||||
#define B_TRANSLATION_CONTEXT "AboutWindow"
|
#define B_TRANSLATION_CONTEXT "AboutWindow"
|
||||||
|
|
||||||
|
|
||||||
|
namespace BPrivate {
|
||||||
|
|
||||||
class StripeView : public BView {
|
class StripeView : public BView {
|
||||||
public:
|
public:
|
||||||
StripeView(BBitmap* icon);
|
StripeView(BBitmap* icon);
|
||||||
@@ -371,6 +373,8 @@ AboutView::SetVersion(const char* version)
|
|||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // namespace BPrivate
|
||||||
|
|
||||||
|
|
||||||
// #pragma mark - BAboutWindow
|
// #pragma mark - BAboutWindow
|
||||||
|
|
||||||
@@ -390,7 +394,7 @@ BAboutWindow::BAboutWindow(const char* appName, const char* signature)
|
|||||||
title.ReplaceFirst("%app%", appName);
|
title.ReplaceFirst("%app%", appName);
|
||||||
SetTitle(title.String());
|
SetTitle(title.String());
|
||||||
|
|
||||||
fAboutView = new AboutView(appName, signature);
|
fAboutView = new BPrivate::AboutView(appName, signature);
|
||||||
AddChild(fAboutView);
|
AddChild(fAboutView);
|
||||||
|
|
||||||
MoveTo(AboutPosition(Frame().Width(), Frame().Height()));
|
MoveTo(AboutPosition(Frame().Width(), Frame().Height()));
|
||||||
|
|||||||
Reference in New Issue
Block a user