projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing xti problems
[wxWidgets.git]
/
include
/
wx
/
mac
/
mdi.h
diff --git
a/include/wx/mac/mdi.h
b/include/wx/mac/mdi.h
index 091021d0fc7459f143ddc5c0d841c4c5e7830805..d92254fe4d06412e2dfee12dfe417d288d486046 100644
(file)
--- a/
include/wx/mac/mdi.h
+++ b/
include/wx/mac/mdi.h
@@
-3,25
+3,25
@@
// Purpose: MDI (Multiple Document Interface) classes.
// This doesn't have to be implemented just like Windows,
// it could be a tabbed design as in wxGTK.
// Purpose: MDI (Multiple Document Interface) classes.
// This doesn't have to be implemented just like Windows,
// it could be a tabbed design as in wxGTK.
-// 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_MDI_H_
#define _WX_MDI_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MDI_H_
#define _WX_MDI_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "mdi.h"
#endif
#include "wx/frame.h"
#pragma interface "mdi.h"
#endif
#include "wx/frame.h"
-WXDLLEXPORT_DATA(extern const
c
har*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const
c
har*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const
wxC
har*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const
wxC
har*) wxStatusLineNameStr;
class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame;
class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame;
@@
-54,17
+54,15
@@
public:
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr);
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr);
- void OnSize(wxSizeEvent& event);
+ // Mac OS activate event
+ virtual void MacActivate(long timestamp, bool activating);
+
+ // wxWindows activate event
void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
void SetMenuBar(wxMenuBar *menu_bar);
void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
void SetMenuBar(wxMenuBar *menu_bar);
- // Gets the size available for subwindows after menu size, toolbar size
- // and status bar size have been subtracted. If you want to manage your own
- // toolbar(s), don't call SetToolBar.
- void DoGetClientSize(int *width, int *height) const;
-
// Get the active MDI child window (Windows only)
wxMDIChildFrame *GetActiveChild() const ;
// Get the active MDI child window (Windows only)
wxMDIChildFrame *GetActiveChild() const ;
@@
-125,6
+123,9
@@
public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
+ // Mac OS activate event
+ virtual void MacActivate(long timestamp, bool activating);
+
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
@@
-162,6
+163,11
@@
class WXDLLEXPORT wxMDIClientWindow: public wxWindow
// Note: this is virtual, to allow overridden behaviour.
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
// Note: this is virtual, to allow overridden behaviour.
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
+ // Gets the size available for subwindows after menu size, toolbar size
+ // and status bar size have been subtracted. If you want to manage your own
+ // toolbar(s), don't call SetToolBar.
+ void DoGetClientSize(int *width, int *height) const;
+
// Explicitly call default scroll behaviour
void OnScroll(wxScrollEvent& event);
// Explicitly call default scroll behaviour
void OnScroll(wxScrollEvent& event);