projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed more unneeded files, see patch 890642
[wxWidgets.git]
/
src
/
cocoa
/
toplevel.mm
diff --git
a/src/cocoa/toplevel.mm
b/src/cocoa/toplevel.mm
index 121c6ffdbad1ea6268860bce71d0500388802222..d87628547c97e560ed367bd579ac348cbaf92cbd 100644
(file)
--- a/
src/cocoa/toplevel.mm
+++ b/
src/cocoa/toplevel.mm
@@
-4,9
+4,9
@@
// Author: David Elliott
// Modified by:
// Created: 2002/11/27
// Author: David Elliott
// Modified by:
// Created: 2002/11/27
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) 2002 David Elliott
// Copyright: (c) 2002 David Elliott
-// Licen
se: wxWindows licens
e
+// Licen
ce: wxWindows licenc
e
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-30,7
+30,6
@@
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/string.h"
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/string.h"
-#include "wx/cocoa/mbarman.h"
#import <AppKit/NSView.h>
#import <AppKit/NSWindow.h>
#import <AppKit/NSView.h>
#import <AppKit/NSWindow.h>
@@
-46,6
+45,8
@@
wxWindowList wxModelessWindows;
// wxTopLevelWindowCocoa implementation
// ============================================================================
// wxTopLevelWindowCocoa implementation
// ============================================================================
+wxTopLevelWindowCocoa *wxTopLevelWindowCocoa::sm_cocoaDeactivateWindow = NULL;
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowCocoa creation
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxTopLevelWindowCocoa creation
// ----------------------------------------------------------------------------
@@
-101,8
+102,19
@@
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;
// NOTE: y-origin needs to be flipped.
// NOTE: y-origin needs to be flipped.
- NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(
pos.x,pos.y,size.x,
size.y) styleMask:cocoaStyle];
+ NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(
realpos.x,realpos.y,realsize.x,real
size.y) styleMask:cocoaStyle];
m_cocoaNSWindow = NULL;
m_cocoaNSView = NULL;
m_cocoaNSWindow = NULL;
m_cocoaNSView = NULL;
@@
-125,27
+137,38
@@
bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
{
wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
{
+ wxASSERT(sm_cocoaDeactivateWindow!=this);
wxAutoNSAutoreleasePool pool;
DestroyChildren();
SetNSWindow(NULL);
}
wxAutoNSAutoreleasePool pool;
DestroyChildren();
SetNSWindow(NULL);
}
+bool wxTopLevelWindowCocoa::Destroy()
+{
+ if(sm_cocoaDeactivateWindow==this)
+ {
+ sm_cocoaDeactivateWindow = NULL;
+ wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey();
+ }
+ return wxTopLevelWindowBase::Destroy();
+}
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowCocoa Cocoa Specifics
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxTopLevelWindowCocoa Cocoa Specifics
// ----------------------------------------------------------------------------
-wxMenuBar* wxTopLevelWindowCocoa::GetAppMenuBar()
+wxMenuBar* wxTopLevelWindowCocoa::GetAppMenuBar(
wxCocoaNSWindow *win
)
{
wxTopLevelWindowCocoa *parent = wxDynamicCast(GetParent(),wxTopLevelWindow);
if(parent)
{
wxTopLevelWindowCocoa *parent = wxDynamicCast(GetParent(),wxTopLevelWindow);
if(parent)
- return parent->GetAppMenuBar();
+ return parent->GetAppMenuBar(
win
);
return NULL;
}
void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
{
bool need_debug = cocoaNSWindow || m_cocoaNSWindow;
return NULL;
}
void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
{
bool need_debug = cocoaNSWindow || m_cocoaNSWindow;
- if(need_debug) wxLog
Debug("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d"
,this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]);
+ if(need_debug) wxLog
Trace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d")
,this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]);
DisassociateNSWindow(m_cocoaNSWindow);
[cocoaNSWindow retain];
[m_cocoaNSWindow release];
DisassociateNSWindow(m_cocoaNSWindow);
[cocoaNSWindow retain];
[m_cocoaNSWindow release];
@@
-155,7
+178,7
@@
void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
else
SetNSView(NULL);
AssociateNSWindow(m_cocoaNSWindow);
else
SetNSView(NULL);
AssociateNSWindow(m_cocoaNSWindow);
- if(need_debug) wxLog
Debug("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d"
,this,cocoaNSWindow,[cocoaNSWindow retainCount]);
+ if(need_debug) wxLog
Trace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d")
,this,cocoaNSWindow,[cocoaNSWindow retainCount]);
}
void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
}
void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
@@
-164,9
+187,17
@@
void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newVie
[m_cocoaNSWindow setContentView:newView];
}
[m_cocoaNSWindow setContentView:newView];
}
+/*static*/ void wxTopLevelWindowCocoa::DeactivatePendingWindow()
+{
+ if(sm_cocoaDeactivateWindow)
+ sm_cocoaDeactivateWindow->wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey();
+ sm_cocoaDeactivateWindow = NULL;
+}
+
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
{
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
{
- wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
+ DeactivatePendingWindow();
+ wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this);
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
@@
-174,7
+205,7
@@
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
{
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
{
- wxLog
Debug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"
,this);
+ wxLog
Trace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey")
,this);
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
@@
-182,22
+213,18
@@
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
{
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
{
- wxLog
Debug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain"
,this);
+ wxLog
Trace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain")
,this);
}
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
{
}
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
{
- wxLog
Debug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain"
,this);
+ wxLog
Trace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain")
,this);
}
void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)
{
m_closed = true;
Destroy();
}
void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)
{
m_closed = true;
Destroy();
- /* Be SURE that idle events get ran. If the window was not active when
- it was closed, then there will be no more events to trigger this and
- therefore it must be done here */
- wxTheApp->CocoaInstallRequestedIdleHandler();
}
bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
}
bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
@@
-205,6
+232,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
// ----------------------------------------------------------------------------
@@
-309,7
+345,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)
{
-
// wxLogDebug(
"wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,
"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];
@@
-322,7
+358,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;
-
// wxLogDebug(
"wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,
"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
@@
-332,6
+368,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;
-
// wxLogDebug(
"wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,
"wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
}
}