projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WinCE build fix (missing style).
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
frame.h
diff --git
a/include/wx/cocoa/frame.h
b/include/wx/cocoa/frame.h
index 041e7b399e9c348d78236b274b783782179548bd..971e872e47056746b3255c99a91dce134e701ce9 100644
(file)
--- a/
include/wx/cocoa/frame.h
+++ b/
include/wx/cocoa/frame.h
@@
-6,7
+6,7
@@
// Created: 2003/03/16
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Created: 2003/03/16
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_FRAME_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_FRAME_H_
@@
-50,12
+50,20
@@
protected:
// ------------------------------------------------------------------------
// Cocoa specifics
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Cocoa specifics
// ------------------------------------------------------------------------
-protected:
- virtual void CocoaSetWxWindowSize(int width, int height);
+public:
+ virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
+ // Returns the NSView for non-client drawing
+ virtual WX_NSView GetNonClientNSView();
// Helper function to position status/tool bars
// Helper function to position status/tool bars
+ // Also called by native toolbar to force a size update
void UpdateFrameNSView();
void UpdateFrameNSView();
+ virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem);
+ virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem);
+protected:
+ virtual void CocoaSetWxWindowSize(int width, int height);
+
virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
// frameNSView is used whenever a statusbar/generic toolbar are present
WX_NSView m_frameNSView;
virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
// frameNSView is used whenever a statusbar/generic toolbar are present
WX_NSView m_frameNSView;
@@
-63,14
+71,14
@@
protected:
// Implementation
// ------------------------------------------------------------------------
public:
// Implementation
// ------------------------------------------------------------------------
public:
- void AttachMenuBar(wxMenuBar *mbar);
- void DetachMenuBar();
+ virtual void AttachMenuBar(wxMenuBar *mbar);
+ virtual void DetachMenuBar();
+ virtual void SetMenuBar(wxMenuBar *menubar);
// implementation only from now on
// -------------------------------
// override some more virtuals
// implementation only from now on
// -------------------------------
// override some more virtuals
- virtual bool Show( bool show = true );
// get the origin of the client area (which may be different from (0, 0)
// if the frame has a toolbar) in client coordinates
// get the origin of the client area (which may be different from (0, 0)
// if the frame has a toolbar) in client coordinates