Ticket #1355: 1355.diff

src/apps/glteapot/TeapotApp.h

@@ -13 +13 @@
     public:
         TeapotApp(const char* sign);
         virtual void MessageReceived(BMessage* msg);
-//      void AboutRequested();
     private:
         TeapotWindow*   fTeapotWindow;
 };

src/apps/glteapot/TeapotWindow.cpp

@@ -41 +41 @@
     BMenuItem*  item;
     msg.AddInt32("num", 256);
     menu->AddItem(item = new BMenuItem("Add a teapot", new BMessage(msg), 'N'));
-    item->SetTarget(fObjectView);   
+    item->SetTarget(fObjectView);
     menu->AddSeparatorItem();
-    menu->AddItem(item = new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
-    item->SetTarget(be_app);
-    msg.RemoveName("num");
+    menu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q'));
     menuBar->AddItem(menu = new BMenu("Options"));
     menu->AddItem(item = new BMenuItem("Perspective", new BMessage(kMsgPerspective)));
     item->SetTarget(fObjectView);
@@ -68 +66 @@
     menu->AddItem(item = new BMenuItem("Gouraud shading", new BMessage(kMsgGouraud)));
     item->SetTarget(fObjectView);
     item->SetMarked(true);
-//  menu->AddItem(item = new BMenuItem("Texture mapped", new BMessage(kMsgTextured)));
-//  item->SetTarget(fObjectView);
     menu->AddItem(item = new BMenuItem("Fog", new BMessage(kMsgFog)));
     item->SetTarget(fObjectView);
 
@@ -163 +159 @@
 bool
 TeapotWindow::QuitRequested()
 {
-//  printf("closing \n");
     fObjectView->EnableDirectMode(false);
     be_app->PostMessage(B_QUIT_REQUESTED);
+
     return true;
 }
 
@@ -182 +178 @@
 void
 TeapotWindow::MessageReceived(BMessage* msg)
 {
-//  msg->PrintToStream();
     switch (msg->what) {
+        case M_FILE_QUIT:
+            PostMessage(B_QUIT_REQUESTED);
+            break;
+
         default:
             BDirectWindow::MessageReceived(msg);
-    }       
+    }
 }

src/apps/glteapot/TeapotWindow.h

@@ -10 +10 @@
 
 #include "ObjectView.h"
 
+enum {
+  M_FILE_QUIT
+};
+
 class TeapotWindow : public BDirectWindow {
     public:
         TeapotWindow(BRect r, char* name, window_type wt, ulong something);
         
         virtual bool QuitRequested();
-        virtual void DirectConnected( direct_buffer_info* info );
+        virtual void DirectConnected(direct_buffer_info* info);
         virtual void MessageReceived(BMessage* msg);
 
     private:

src/apps/glteapot/TeapotApp.cpp

@@ -26 +26 @@
 void
 TeapotApp::MessageReceived(BMessage* msg)
 {
-//  msg->PrintToStream();
     switch (msg->what) {
 
         default: