projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed to WX_DECLARE_LIST_WITH_DECL for consistency
[wxWidgets.git]
/
include
/
wx
/
frame.h
diff --git
a/include/wx/frame.h
b/include/wx/frame.h
index 03fcca147ecec5901c457c76c3b86f8e590acaf6..9c8aa12b1529a72cf857ce52d84098e13311da51 100644
(file)
--- a/
include/wx/frame.h
+++ b/
include/wx/frame.h
@@
-52,7
+52,7
@@
public:
virtual ~wxFrameBase();
wxFrame *New(wxWindow *parent,
virtual ~wxFrameBase();
wxFrame *New(wxWindow *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@
-83,11
+83,11
@@
public:
#ifdef WXWIN_COMPATIBILITY_2_2
// call this to simulate a menu command
#ifdef WXWIN_COMPATIBILITY_2_2
// call this to simulate a menu command
- bool Command(int
id) { return ProcessCommand(
id); }
+ bool Command(int
winid) { return ProcessCommand(win
id); }
#endif // WXWIN_COMPATIBILITY_2_2
// process menu command: returns TRUE if processed
#endif // WXWIN_COMPATIBILITY_2_2
// process menu command: returns TRUE if processed
- bool ProcessCommand(int id);
+ bool ProcessCommand(int
win
id);
// status bar functions
// --------------------
// status bar functions
// --------------------
@@
-95,13
+95,13
@@
public:
// create the main status bar by calling OnCreateStatusBar()
virtual wxStatusBar* CreateStatusBar(int number = 1,
long style = wxST_SIZEGRIP,
// create the main status bar by calling OnCreateStatusBar()
virtual wxStatusBar* CreateStatusBar(int number = 1,
long style = wxST_SIZEGRIP,
- wxWindowID id = 0,
+ wxWindowID
win
id = 0,
const wxString& name =
wxStatusLineNameStr);
// return a new status bar
virtual wxStatusBar *OnCreateStatusBar(int number,
long style,
const wxString& name =
wxStatusLineNameStr);
// return a new status bar
virtual wxStatusBar *OnCreateStatusBar(int number,
long style,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& name);
// get the main status bar
virtual wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
const wxString& name);
// get the main status bar
virtual wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
@@
-122,14
+122,15
@@
public:
// toolbar functions
// -----------------
// toolbar functions
// -----------------
+
#if wxUSE_TOOLBAR
// create main toolbar bycalling OnCreateToolBar()
#if wxUSE_TOOLBAR
// create main toolbar bycalling OnCreateToolBar()
- virtual wxToolBar* CreateToolBar(long style =
wxNO_BORDER|wxTB_HORIZONTAL
,
- wxWindowID id = -1,
+ virtual wxToolBar* CreateToolBar(long style =
-1
,
+ wxWindowID
win
id = -1,
const wxString& name = wxToolBarNameStr);
// return a new toolbar
virtual wxToolBar *OnCreateToolBar(long style,
const wxString& name = wxToolBarNameStr);
// return a new toolbar
virtual wxToolBar *OnCreateToolBar(long style,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& name );
// get/set the main toolbar
const wxString& name );
// get/set the main toolbar
@@
-141,15
+142,21
@@
public:
// -------------------------------
// event handlers
// -------------------------------
// event handlers
- void On
Idle(wxIdle
Event& event);
+ void On
MenuOpen(wxMenu
Event& event);
void OnMenuHighlight(wxMenuEvent& event);
#if wxUSE_MENUS
void OnMenuHighlight(wxMenuEvent& event);
#if wxUSE_MENUS
- // send wxUpdateUIEvents for all menu items
(called from OnIdle())
- void DoMenuUpdates();
- void DoMenuUpdates(wxMenu* menu
, wxWindow* focusWin
);
+ // send wxUpdateUIEvents for all menu items
in the menubar,
+ // or just for menu if non-NULL
+ void DoMenuUpdates(wxMenu* menu
= NULL
);
#endif // wxUSE_MENUS
#endif // wxUSE_MENUS
+ // do the UI update processing for this window
+ virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+
+ // Implement internal behaviour (menu updating on some platforms)
+ virtual void OnInternalIdle();
+
// if there is no real wxTopLevelWindow on this platform we have to define
// some wxTopLevelWindowBase pure virtual functions here to avoid breaking
// old ports (wxMotif) which don't define them in wxFrame
// if there is no real wxTopLevelWindow on this platform we have to define
// some wxTopLevelWindowBase pure virtual functions here to avoid breaking
// old ports (wxMotif) which don't define them in wxFrame
@@
-198,7
+205,7
@@
protected:
// show the help string for this menu item in the given status bar: the
// status bar pointer can be NULL; return TRUE if help was shown
// show the help string for this menu item in the given status bar: the
// status bar pointer can be NULL; return TRUE if help was shown
- bool ShowMenuHelp(wxStatusBar *statbar, int id);
+ bool ShowMenuHelp(wxStatusBar *statbar, int
help
id);
wxStatusBar *m_frameStatusBar;
#endif // wxUSE_STATUSBAR
wxStatusBar *m_frameStatusBar;
#endif // wxUSE_STATUSBAR
@@
-230,6
+237,8
@@
protected:
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
+ #elif defined(__WXCOCOA__)
+ #include "wx/cocoa/frame.h"
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#endif
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#endif