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

If AddToSubset() fails, we now show an error alert.

Browse Source 
B_QUIT_REQUESTED is no longer forwarded to the application too early.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15271 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-12-01 17:08:16 +00:00
parent 7ae647775e
commit 2057d3c0aa
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/servers/app/look_and_feel/LookAndFeel.cpp
+15 -3
View File
@@ -7,6 +7,7 @@
*/ */
#include <Alert.h>
#include <Application.h> #include <Application.h>
#include <Button.h> #include <Button.h>
#include <MenuField.h> #include <MenuField.h>
@@ -16,6 +17,7 @@
#include <Window.h> #include <Window.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
const uint32 kMsgUpdateLook = 'uplk'; const uint32 kMsgUpdateLook = 'uplk';
@@ -218,8 +220,18 @@ Window::MessageReceived(BMessage* message)
BWindow* window = new Window(Frame().OffsetByCopy(20, 20), BWindow* window = new Window(Frame().OffsetByCopy(20, 20),
(window_look)look, (window_feel)feel); (window_look)look, (window_feel)feel);
if (message->what == kMsgAddSubsetWindow) if (message->what == kMsgAddSubsetWindow) {
window->AddToSubset(this); status_t status = window->AddToSubset(this);
if (status != B_OK) {
char text[512];
snprintf(text, sizeof(text),
"Window could not be added to subset:\n\n\%s", strerror(status));
(new BAlert("Alert", text, "Ok"))->Go(NULL);
delete window;
break;
}
}
window->Show(); window->Show();
break; break;
@@ -237,7 +249,7 @@ Window::QuitRequested()
if (!IsModal() && !IsFloating()) if (!IsModal() && !IsFloating())
gNormalWindowCount--; gNormalWindowCount--;
if (gNormalWindowCount < 2) if (gNormalWindowCount < 1)
be_app->PostMessage(B_QUIT_REQUESTED); be_app->PostMessage(B_QUIT_REQUESTED);
return true; return true;