Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added master define for CommandBar vs. PocketPC mixed bar.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-06-12 22:58:28 +00:00
parent 7b999c863b
commit b3900fb51a
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/msw/menu.h
View File

@@ -29,6 +29,20 @@ class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar;
#endif
// Not using a combined wxToolBar/wxMenuBar? then use
// a commandbar in WinCE .NET to implement the
// menubar, since there is no ::SetMenu function.
#if defined(__WXWINCE__)
# if ((_WIN32_WCE >= 400) && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) || \
defined(__HANDHELDPC__)
# define WINCE_WITH_COMMANDBAR
# else
# define WINCE_WITHOUT_COMMANDBAR
# endif
#endif
#include "wx/arrstr.h"
// ----------------------------------------------------------------------------
@@ -172,13 +186,13 @@ public:
virtual void Detach();
virtual void Attach(wxFrame *frame);
#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
// Under WinCE, a menubar is owned by the frame's toolbar
void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; }
wxToolBar* GetToolBar() const { return m_toolBar; }
#endif
#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
#ifdef WINCE_WITH_COMMANDBAR
WXHWND GetCommandBar() const { return m_commandBar; }
bool AddAdornments(long style);
#endif
@@ -222,10 +236,8 @@ protected:
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
wxToolBar* m_toolBar;
#endif
// Not using a combined wxToolBar/wxMenuBar? then use
// a commandbar in WinCE .NET to implement the
// menubar, since there is no ::SetMenu function.
#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
#ifdef WINCE_WITH_COMMANDBAR
WXHWND m_commandBar;
bool m_adornmentsAdded;
#endif