Implement wxMenuItemAction: and validateMenuItem: delegate messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e498079eb4
commit
86adc75813
@ -36,6 +36,8 @@ public:
|
|||||||
virtual void CocoaDelegate_windowDidResignKey(void) { }
|
virtual void CocoaDelegate_windowDidResignKey(void) { }
|
||||||
virtual void CocoaDelegate_windowDidBecomeMain(void) { }
|
virtual void CocoaDelegate_windowDidBecomeMain(void) { }
|
||||||
virtual void CocoaDelegate_windowDidResignMain(void) { }
|
virtual void CocoaDelegate_windowDidResignMain(void) { }
|
||||||
|
virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender) = 0;
|
||||||
|
virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender) = 0;
|
||||||
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
|
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
|
||||||
protected:
|
protected:
|
||||||
wxCocoaNSWindow();
|
wxCocoaNSWindow();
|
||||||
|
@ -67,6 +67,8 @@ public:
|
|||||||
virtual void CocoaDelegate_windowDidResignKey(void);
|
virtual void CocoaDelegate_windowDidResignKey(void);
|
||||||
virtual void CocoaDelegate_windowDidBecomeMain(void);
|
virtual void CocoaDelegate_windowDidBecomeMain(void);
|
||||||
virtual void CocoaDelegate_windowDidResignMain(void);
|
virtual void CocoaDelegate_windowDidResignMain(void);
|
||||||
|
virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender);
|
||||||
|
virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender);
|
||||||
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
|
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
|
||||||
static void DeactivatePendingWindow();
|
static void DeactivatePendingWindow();
|
||||||
protected:
|
protected:
|
||||||
|
@ -49,6 +49,10 @@
|
|||||||
- (void)windowDidResignMain: (NSNotification *)notification;
|
- (void)windowDidResignMain: (NSNotification *)notification;
|
||||||
- (BOOL)windowShouldClose: (id)sender;
|
- (BOOL)windowShouldClose: (id)sender;
|
||||||
- (void)windowWillClose: (NSNotification *)notification;
|
- (void)windowWillClose: (NSNotification *)notification;
|
||||||
|
|
||||||
|
// Menu item handlers
|
||||||
|
- (void)wxMenuItemAction: (id)sender;
|
||||||
|
- (BOOL)validateMenuItem: (id)menuItem;
|
||||||
@end //interface wxNSWindowDelegate
|
@end //interface wxNSWindowDelegate
|
||||||
|
|
||||||
@implementation wxNSWindowDelegate : NSObject
|
@implementation wxNSWindowDelegate : NSObject
|
||||||
@ -69,6 +73,7 @@
|
|||||||
return m_wxCocoaInterface;
|
return m_wxCocoaInterface;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Delegate message handlers
|
||||||
- (void)windowDidBecomeKey: (NSNotification *)notification
|
- (void)windowDidBecomeKey: (NSNotification *)notification
|
||||||
{
|
{
|
||||||
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
|
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
|
||||||
@ -123,6 +128,19 @@
|
|||||||
win->CocoaDelegate_windowWillClose();
|
win->CocoaDelegate_windowWillClose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Menu item handlers
|
||||||
|
- (void)wxMenuItemAction: (id)sender
|
||||||
|
{
|
||||||
|
wxASSERT(m_wxCocoaInterface);
|
||||||
|
m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL)validateMenuItem: (id)sender
|
||||||
|
{
|
||||||
|
wxASSERT(m_wxCocoaInterface);
|
||||||
|
return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);
|
||||||
|
}
|
||||||
|
|
||||||
@end //implementation wxNSWindowDelegate
|
@end //implementation wxNSWindowDelegate
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
@ -232,6 +232,15 @@ bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
|
|||||||
return wxWindowBase::Close(false);
|
return wxWindowBase::Close(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(struct objc_object *sender)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(struct objc_object *sender)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxTopLevelWindowCocoa maximize/minimize
|
// wxTopLevelWindowCocoa maximize/minimize
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user