projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added missing #include <wx/defs.h> (parts of patch 649438)
[wxWidgets.git]
/
include
/
wx
/
mac
/
frame.h
diff --git
a/include/wx/mac/frame.h
b/include/wx/mac/frame.h
index 7f1c6ff07d13f69b5d92340ec5c13364cde6d02d..44038e6ddd101be1f74f18949dde90b9c7b3018e 100644
(file)
--- a/
include/wx/mac/frame.h
+++ b/
include/wx/mac/frame.h
@@
-1,18
+1,18
@@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.h
// Purpose: wxFrame class
/////////////////////////////////////////////////////////////////////////////
// Name: frame.h
// Purpose: wxFrame class
-// Author:
AUTHOR
+// Author:
Stefan Csomor
// Modified by:
// Modified by:
-// Created:
??/??/98
+// Created:
1998-01-01
// RCS-ID: $Id$
// RCS-ID: $Id$
-// Copyright: (c)
AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c)
Stefan Csomor
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "frame.h"
#endif
#pragma interface "frame.h"
#endif
@@
-21,14
+21,15
@@
#include "wx/accel.h"
#include "wx/icon.h"
#include "wx/accel.h"
#include "wx/icon.h"
-WXDLLEXPORT_DATA(extern const
c
har*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const
c
har*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const
wxC
har*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const
wxC
har*) wxToolBarNameStr;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxMacToolTip ;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxMacToolTip ;
-class WXDLLEXPORT wxFrame: public wxFrameBase {
+class WXDLLEXPORT wxFrame: public wxFrameBase
+{
public:
// construction
wxFrame() { Init(); }
public:
// construction
wxFrame() { Init(); }
@@
-59,7
+60,7
@@
public:
// -------------------------------
// override some more virtuals
// -------------------------------
// override some more virtuals
-
virtual bool Enable(bool enable
) ;
+
virtual bool Enable(bool enable = 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
@@
-100,6
+101,10
@@
public:
wxMacToolTip* m_hwndToolTip ;
#endif // tooltips
wxMacToolTip* m_hwndToolTip ;
#endif // tooltips
+ // called by wxWindow whenever it gets focus
+ void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+ wxWindow *GetLastFocus() const { return m_winLastFocused; }
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-108,6
+113,9
@@
protected:
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
+ virtual void DetachMenuBar();
+ virtual void AttachMenuBar(wxMenuBar *menubar);
+
protected:
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
protected:
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;