Commit Graph

98 Commits

Author SHA1 Message Date
Julian Smart
c393c74021 Implemented Enable for wxMenuBar to avoid assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 19:28:13 +00:00
David Elliott
4224f05975 Instead of m_menuBar use GetMenuBar() which will be modified (with next patch)
to traverse up the menu hierarchy to return the menu bar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-30 00:43:16 +00:00
Stefan Csomor
a9412f8f03 font encoding support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:23:07 +00:00
Robin Dunn
9add93670b wxMenu::Append (and similar) now return a pointer to the wxMenuItem
that was added.  Checked on MSW, GTK, and Mac, other port authors
please double check changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 18:46:05 +00:00
Stefan Csomor
fa9f937f05 applied bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 08:26:05 +00:00
Stefan Csomor
2202608853 unicode fixes, enabling notebook images again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 10:00:56 +00:00
Václav Slavík
a3bf7524f3 removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:50:53 +00:00
Stefan Csomor
5fe384748c changed Remove to RemoveAt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 19:48:05 +00:00
David Elliott
1b1d2207ea Add ability to have a wxMenuBar as a common menu
- static wxMenuBar::MacSetCommonMenuBar()
- static wxMenuBar::MacGetCommonMenuBar()
- static wxMenuBar::s_macCommonMenuBar;


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 18:17:33 +00:00
Stefan Csomor
4ab107d7f1 corrected error in last fix for insert items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 08:34:07 +00:00
Robin Dunn
58751a8685 fix so wxMenu::InsertItem actually inserts rather than overwrites
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 23:46:36 +00:00
Vadim Zeitlin
5be55d562f compilation warnings fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:16:07 +00:00
Gilles Depeyrot
06ea1f023e removed unused variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:13:29 +00:00
Stefan Csomor
427ff66291 wxMac Unicode support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 20:33:32 +00:00
Stefan Csomor
d46342af50 submenu preparation in two methods encapsulated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 15:50:28 +00:00
Julian Smart
e40298d54e Tidied space and tabs in wxMac files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:48:13 +00:00
Julian Smart
a31a5f8534 Tidied copyright and date for wxMac files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 21:54:04 +00:00
Stefan Csomor
7c15086ca4 Review, Carbon Events support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 12:27:43 +00:00
Gilles Depeyrot
f823cacbda corrected wxList::Node declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 19:44:23 +00:00
Gilles Depeyrot
eb22f2a6dc updated source to not use deprecated wxList methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 07:01:22 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Stefan Csomor
93e5d8999f added forcing to image conversion to always attempt a color icon (needed eg for menus)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-25 21:02:39 +00:00
Stefan Csomor
867e99f57d switched to MacOS 8.5+ implementation for submenus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-23 09:20:10 +00:00
Gilles Depeyrot
6d6da89ccb applied SourceForge patch # 544164 (hidden virtual method in wxMenuBar)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-05 20:00:47 +00:00
Gilles Depeyrot
2b8a696220 corrected warnings and removed useless extern declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-03 17:48:10 +00:00
Stefan Csomor
d9e054bc61 resource loader structure added for loading menu bar, apple menu will not get multiple entries under classic anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-20 16:32:03 +00:00
Gilles Depeyrot
8caf72d33e removed __DARWIN__ conditional tests (the help menu doesn't work otherwise)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 08:33:40 +00:00
Stefan Csomor
a3590de1a3 corrected apple menu and help menu anomalies under carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-14 14:13:48 +00:00
Stefan Csomor
40325b2630 corrected wxMenuBar::Insert , ::Append for a correct title even when the menubar is already attached, also removed a menu->attach which is not necessary anymore.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-11 19:14:30 +00:00
Stefan Csomor
76a5e5d21e removing dependancy on mac headers from public wx headers (eventually adding wx/mac/private and typecasts)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-04 17:26:02 +00:00
Stefan Csomor
5bc0790f29 corrected constness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-08 08:00:39 +00:00
Stefan Csomor
b03e4fcd11 added method for getting the help menu on classic and carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-07 05:35:57 +00:00
Stefan Csomor
9673f535ac corrected rebuild of more than one-level hiearchical menus when not directly added to the current menubar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-02 20:47:11 +00:00
Stefan Csomor
7205570233 added conversion routines to CIconHandle, removing pre 8.6 routines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-28 19:32:42 +00:00
Gilles Depeyrot
f5c6eb5c17 modified configure to allow configuration of wxMotif under Darwin/Mac OS X
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 21:12:31 +00:00
Gilles Depeyrot
3ef585df0c use RemoveAt instead of Remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 13:47:31 +00:00
Stefan Csomor
90b959aee4 post wxUniv merge fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 16:19:53 +00:00
Gilles Depeyrot
82ca6dbcf4 applied SourceForge patch #423532
ensure that menus appear correctly under Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-13 13:09:41 +00:00
Stefan Csomor
41f38f4d59 added menubar update OnActivate for multiple frames with their own menubars, it's not perfect (menu merge) would be better, but at last something
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 13:04:19 +00:00
Gilles Depeyrot
03e11df547 modifications for compilation under Mac OS X
applied patches extracted from submission by Marc Newsam (tested under Mac OS 9)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-15 21:51:14 +00:00
Stefan Csomor
5b781a6729 updated mac sources (CW 5.3 working , CW6 still having code gen problems)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 21:13:12 +00:00
Stefan Csomor
2f1ae41432 merge with latest sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-09 10:10:14 +00:00
Stefan Csomor
8208e181cb mac updates and msw bitmapdrawing on printer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-13 11:07:58 +00:00
Václav Slavík
ad81651f00 removed USE_SHARED_LIBRARY(IES)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-14 23:57:30 +00:00
Stefan Csomor
51abe921b8 wxMac (debug) builds and runs wxMinimal again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-10 11:32:00 +00:00
Stefan Csomor
e75491071d mac adaptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-09 15:24:52 +00:00
Stefan Csomor
519cb848a8 CW5.2 Pro Adaptions, wxMac starting to move in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-05 09:16:09 +00:00
Stefan Csomor
e9576ca53d started once again from stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-01-01 15:56:08 +00:00