X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adbc621dcb7ba0590d2990f99585f40782daf4a0..4837b89e3b9ddc02a752d9937e3e1d9f92328851:/src/common/framecmn.cpp?ds=sidebyside diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 995bf80b19..3137700a88 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -16,10 +16,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "framebase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -205,6 +201,9 @@ bool wxFrameBase::ProcessCommand(int id) if (!item->IsEnabled()) return true; + if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() ) + return true; + if (item->IsCheckable()) { item->Toggle(); @@ -489,9 +488,15 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style, wxWindowID id, const wxString& name) { +#if defined(__WXWINCE__) && defined(__POCKETPC__) + return new wxToolMenuBar(this, id, + wxDefaultPosition, wxDefaultSize, + style, name); +#else return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name); +#endif } void wxFrameBase::SetToolBar(wxToolBar *toolbar) @@ -563,12 +568,3 @@ void wxFrameBase::SetMenuBar(wxMenuBar *menubar) } #endif // wxUSE_MENUS - -#if WXWIN_COMPATIBILITY_2_2 - -bool wxFrameBase::Command(int winid) -{ - return ProcessCommand(winid); -} - -#endif // WXWIN_COMPATIBILITY_2_2