summaryrefslogtreecommitdiff
path: root/beos/beos_window.cpp
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2008-10-17 21:59:44 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2008-10-17 21:59:44 +0000
commit174a8dcca2cb1a8fdaed09382650836edf0df9a8 (patch)
tree0075b14f531d847cf3b7846a7e1512798748f2bb /beos/beos_window.cpp
parentf74cd65518bf13e6f8270acd560c64a0038d2f2f (diff)
downloadnetsurf-174a8dcca2cb1a8fdaed09382650836edf0df9a8.tar.gz
netsurf-174a8dcca2cb1a8fdaed09382650836edf0df9a8.tar.bz2
- when replicated, forbid creating windows, even though it initially works it crashes as soon as the menus are used.
- added an about box from the infos in the gtk code, still not perfect. svn path=/trunk/netsurf/; revision=5590
Diffstat (limited to 'beos/beos_window.cpp')
-rw-r--r--beos/beos_window.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/beos/beos_window.cpp b/beos/beos_window.cpp
index 3d66a2c82..b18504b2c 100644
--- a/beos/beos_window.cpp
+++ b/beos/beos_window.cpp
@@ -31,6 +31,7 @@ extern "C" {
#include "utils/utf8.h"
#include "utils/utils.h"
}
+#include "beos/beos_about.h"
#include "beos/beos_window.h"
#include "beos/beos_font.h"
#include "beos/beos_gui.h"
@@ -101,6 +102,8 @@ struct gui_window {
struct gui_window *next, *prev;
};
+
+
static const rgb_color kWhiteColor = {255, 255, 255, 255};
static struct gui_window *window_list = 0; /**< first entry in win list*/
@@ -397,6 +400,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
} else {
/* Now construct and attach a scaffold */
g->scaffold = nsbeos_new_scaffolding(g);
+ if (!g->scaffold)
+ return NULL;
}
/* Construct our primary elements */
@@ -688,8 +693,7 @@ void nsbeos_dispatch_event(BMessage *message)
break;
case B_ABOUT_REQUESTED:
{
- //BAlert *alert;
- //XXX: i18n-ize
+ nsbeos_about(gui);
/* XXX: doesn't work yet! bug in rsrc:/
BString url("rsrc:/about.en.html,text/html");
browser_window_create(url.String(), NULL, NULL, true, false);
@@ -1287,6 +1291,9 @@ void nsbeos_window_destroy_browser(struct gui_window *g)
void gui_window_destroy(struct gui_window *g)
{
+ if (!g)
+ return;
+
if (g->prev)
g->prev->next = g->next;
else