Really remove the droppings when there are no pages

[wxWidgets.git] / src / cocoa / toplevel.mm

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 9cdfa7a7835bbc7186307c8cfb50f13aa2a1af71..4778cc36686cb8df5b67fb743f0c9a90f5b13bed 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -6,7 +6,7 @@
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -102,19 +102,30 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     if(style & wxFRAME_TOOL_WINDOW)
         cocoaStyle |= NSUtilityWindowMask;
 
     if(style & wxFRAME_TOOL_WINDOW)
         cocoaStyle |= NSUtilityWindowMask;
 

-    wxPoint realpos = pos;
-    wxSize realsize = size;
-    // FIXME: this is lame
-    if(realpos.x==-1)
-        realpos.x=100;
-    if(realpos.y==-1)
-        realpos.y=100;
-    if(realsize.x==-1)
-        realsize.x=200;
-    if(realsize.y==-1)
-        realsize.y=200;
+    // Create frame and check and handle default position and size
+    int realx,
+        realy;
+    
+    // WX has no set default position - the carbon port caps the low
+    // end at 20, 50.  Here we do the same, except instead of setting
+    // it to 20 and 50, we set it to 100 and 100 if the values are too low
+    if (pos.x < 20)
+        realx = 100;
+    else
+        realx = pos.x;
+        
+    if (pos.y < 50)
+        realy = 100;
+    else
+        realy = pos.y;
+
+    int realw = WidthDefault(size.x);
+    int realh = HeightDefault(size.y);
+

     // NOTE: y-origin needs to be flipped.
     // NOTE: y-origin needs to be flipped.

-    NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(realpos.x,realpos.y,realsize.x,realsize.y) styleMask:cocoaStyle];
+    NSRect cocoaRect = [NSWindow
+                        contentRectForFrameRect:NSMakeRect(realx,realy,realw,realh) 
+                        styleMask:cocoaStyle];

 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;
 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;


@@ -140,6 +151,8 @@ wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
     wxASSERT(sm_cocoaDeactivateWindow!=this);
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
     wxASSERT(sm_cocoaDeactivateWindow!=this);
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();

+    if(m_cocoaNSView)
+        SendDestroyEvent();

     SetNSWindow(NULL);
 }
 
     SetNSWindow(NULL);
 }
 


@@ -232,6 +245,15 @@ bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
     return wxWindowBase::Close(false);
 }
 
     return wxWindowBase::Close(false);
 }
 

+void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem)
+{
+}
+
+bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem)
+{
+    return false;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa maximize/minimize
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa maximize/minimize
 // ----------------------------------------------------------------------------


@@ -265,7 +287,7 @@ bool wxTopLevelWindowCocoa::Show(bool show)
     wxAutoNSAutoreleasePool pool;
     if(show)
     {
     wxAutoNSAutoreleasePool pool;
     if(show)
     {

-        // Send the window a size event because wxWindows apps expect it
+        // Send the window a size event because wxWidgets apps expect it

         // NOTE: This should really only be done the first time a window
         // is shown.  I doubt this will cause any problems though.
         wxSizeEvent event(GetSize(), GetId());
         // NOTE: This should really only be done the first time a window
         // is shown.  I doubt this will cause any problems though.
         wxSizeEvent event(GetSize(), GetId());


@@ -336,7 +358,7 @@ void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {

-    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);

 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];
 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];


@@ -349,7 +371,7 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;

-    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);

 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const


@@ -359,6 +381,6 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;

-    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);

 }
 
 }