Changeset 24049

Timestamp:

02/21/08 15:10:41 (9 months ago)

Author:

stippi

Message:

Applied patch by Maurice Kalinowski with additional changes by myself:
* Fixed ResEdit build.
* Small cleanups and simplifications.
* Removed reference to CapitalB resource in ReadyToRun().

Location:

haiku/trunk/src/apps/resedit

Files:

• App.cpp (modified) (4 diffs)
• Jamfile (modified) (1 diff)
• ResWindow.cpp (modified) (1 diff)
• ResWindow.h (modified) (2 diffs)

haiku/trunk/src/apps/resedit/App.cpp

@@ -17 +17 @@
         return 0;
 }
+
 
 App::App(void)
@@ -37 +38 @@
 App::ReadyToRun(void)
 {
-/*
-        if (fWindowCount < 1) {
-                ResWindow *win = new ResWindow(BRect(50,100,600,400));
-                win->Show();
-        }
-*/
-        if (fWindowCount < 1) {
-                BEntry entry("/boot/develop/projects/ResEdit/CapitalBe.rsrc");
-                entry_ref ref;
-                entry.GetRef(&ref);
-                ResWindow *win = new ResWindow(BRect(50,100,600,400),&ref);
-                win->Show();
-        }
+        if (fWindowCount < 1)
+                new ResWindow(BRect(50, 100, 600, 400));
 }
 
@@ -83 +73 @@
 App::ArgvReceived(int32 argc, char** argv)
 {
-        int i;
-        for (i = 1; i < argc; i++) {
+        for (int32 i = 1; i < argc; i++) {
                 BEntry entry(argv[i]);
                 entry_ref ref;
                 if (entry.GetRef(&ref) < B_OK)
                         continue;
-                ResWindow *win = new ResWindow(BRect(50,100,600,400),&ref);
-                win->Show();
+                new ResWindow(BRect(50, 100, 600, 400), &ref);
         }
 }
+
 
 void
@@ -98 +87 @@
 {
         entry_ref ref;
-        int32 i=0;
-        while (msg->FindRef("refs",i,&ref) == B_OK) {
-                ResWindow *win = new ResWindow(BRect(50,100,600,400),&ref);
-                win->Show();
-                i++;
-        }
+        int32 i = 0;
+        while (msg->FindRef("refs", i++, &ref) == B_OK)
+                new ResWindow(BRect(50, 100, 600, 400), &ref);
 }
 

haiku/trunk/src/apps/resedit/Jamfile

@@ -27 +27 @@
         ResView.cpp
         ResWindow.cpp
-        : be tracker translation
+        : be tracker translation libcolumnlistview.a
 ;

haiku/trunk/src/apps/resedit/ResWindow.cpp

@@ -15 +15 @@
         be_app->PostMessage(M_REGISTER_WINDOW);
         
-        ResView *child = new ResView(Bounds(), "resview", B_FOLLOW_ALL, B_WILL_DRAW, ref);
+        ResView *child = new ResView(Bounds(), "resview", B_FOLLOW_ALL,
+                B_WILL_DRAW, ref);
         AddChild(child);
         
         SetTitle(child->Filename());
+
+        Show();
 }
 

haiku/trunk/src/apps/resedit/ResWindow.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005-2006, Haiku, Inc.
+ * Copyright (c) 2005-2008, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
@@ -11 +11 @@
 #include <Window.h>
 
-class ResWindow : public BWindow
-{
+
+struct entry_ref;
+
+class ResWindow : public BWindow {
 public:
-                                ResWindow(const BRect &rect,
-                                                                const entry_ref *ref=NULL);
-                                ~ResWindow(void);
-        bool            QuitRequested(void);
+                                                                ResWindow(const BRect& rect,
+                                                                        const entry_ref* ref = NULL);
+        virtual                                         ~ResWindow();
+
+        virtual bool                            QuitRequested();
 };
 
-#endif
+#endif // RESWIN_H