[Gnash-commit] gnash/gui aqua.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/03/21 04:37:55

Modified files:
        gui            : aqua.cpp 

Log message:
        some old code I never checked in for some reason

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- aqua.cpp    5 Mar 2008 03:55:51 -0000       1.30
+++ aqua.cpp    21 Mar 2008 04:37:54 -0000      1.31
@@ -15,6 +15,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+<<<<<<< aqua.cpp
+// 
+//
+
+/* $Id: aqua.cpp,v 1.31 2008/03/21 04:37:54 nihilus Exp $ */
+=======
+>>>>>>> 1.30
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -40,7 +47,8 @@
 
 namespace gnash {
 
-WindowRef      myWindow;
+/* Main window widget */
+WindowRef myWindow = NULL;
 
 pascal OSStatus DoWindowClose (EventHandlerCallRef  nextHandler,
                                EventRef             theEvent,
@@ -87,7 +95,7 @@
     RepositionWindow(myWindow, NULL, kWindowCascadeOnMainScreen);
     SelectWindow(myWindow);
     ShowWindow(myWindow);
-    
+       SetWindowModified(myWindow, false);
     RunApplicationEventLoop();
     return true;
 }
@@ -102,7 +110,7 @@
       InvalWindowRect (myWindow,  &rectPort); // force redrow
 }
 
-bool AquaGui::init(int argc, char ***argv)
+bool AquaGui::init(int argc, char **argv[]) /* Self-explainatory */
 {
 
        OSErr err;
@@ -159,9 +167,10 @@
 
 bool AquaGui::createWindow(const char* title, int width, int height)
 {
-       CFStringRef     windowTitle;
+       CFStringRef     windowTitle = NULL;
        OSStatus        result;
-       Rect            theBounds;
+       Rect            theBounds = {0, 0, 0, 0};
+
        EventTypeSpec     eventType;                 // Specifier for event type
        EventHandlerUPP   handlerUPP;                // Pointer to event 
handler routine
  
@@ -176,7 +185,7 @@
                        
        windowTitle = CFStringCreateWithCString(NULL, title, NULL);
        result = SetWindowTitleWithCFString(myWindow, windowTitle);
-       CFRelease (windowTitle);                        
+       if(windowTitle != NULL)CFRelease(windowTitle);
 
        createMenu();
        
@@ -206,7 +215,6 @@
        /* Enable 'About' */
        InsertMenuItemTextWithCFString(rApplicationMenu, CFSTR("About gnash"), 
(short) 0, 0, kHICommandAbout);
 
-       //HIAboutBox(NULL);     
        return true;
 }