projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for icon flags to wxGenericNotificationMessage
[wxWidgets.git]
/
include
/
wx
/
frame.h
diff --git
a/include/wx/frame.h
b/include/wx/frame.h
index 15bbfd7c35dc1d8a95c53f2762e8f43fedfd2628..3c2c3888d8dae3852c44ba7d53da439829e4abec 100644
(file)
--- a/
include/wx/frame.h
+++ b/
include/wx/frame.h
@@
-19,11
+19,12
@@
#include "wx/toplevel.h" // the base class
// the default names for various classs
#include "wx/toplevel.h" // the base class
// the default names for various classs
-extern WXDLLEXPORT_DATA(const
wxC
har) wxStatusLineNameStr[];
-extern WXDLLEXPORT_DATA(const
wxC
har) wxToolBarNameStr[];
+extern WXDLLEXPORT_DATA(const
c
har) wxStatusLineNameStr[];
+extern WXDLLEXPORT_DATA(const
c
har) wxToolBarNameStr[];
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuItem;
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
@@
-180,6
+181,11
@@
public:
virtual void DoGiveHelp(const wxString& text, bool show);
#endif
virtual void DoGiveHelp(const wxString& text, bool show);
#endif
+ virtual bool IsClientAreaChild(const wxWindow *child) const
+ {
+ return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
+ }
+
protected:
// the frame main menu/status/tool bars
// ------------------------------------
protected:
// the frame main menu/status/tool bars
// ------------------------------------
@@
-190,10
+196,6
@@
protected:
// test whether this window makes part of the frame
virtual bool IsOneOfBars(const wxWindow *win) const;
// test whether this window makes part of the frame
virtual bool IsOneOfBars(const wxWindow *win) const;
- virtual bool IsClientAreaChild(const wxWindow *child) const
- {
- return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
- }
#if wxUSE_MENUS
// override to update menu bar position when the frame size changes
#if wxUSE_MENUS
// override to update menu bar position when the frame size changes