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

Added wxUSE_POCKETPC_UI to distinguish between using

Browse Source 
combined toolbar/menubar and using separate ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-28 01:07:31 +00:00
parent c0f984728e
commit a96b4743ff
10 changed files with 152 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ public:
virtual void Detach();
virtual void Attach(wxFrame *frame);
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
// Under WinCE, a menubar is owned by the frame's toolbar
void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; }
wxToolBar* GetToolBar() const { return m_toolBar; }
@@ -214,6 +214,12 @@ 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 && !wxUSE_POCKETPC_UI)
WXHWND m_commandBar;
#endif
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)

23
include/wx/msw/wince/setup.h
View File

@@ -146,9 +146,9 @@
//
// Default is 0
//
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
// Recommended setting: 1
#ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0
#define wxUSE_UNICODE 1
#endif
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
@@ -1061,9 +1061,26 @@
// (notably, wxNotebook pages)
#define wxUSE_UXTHEME_AUTO 0
// Set to 1 to if you're developing for MS SmartPhone
// Set to 1 if you're developing for MS SmartPhone
#define wxUSE_SMARTPHONE 0
// Set to 1 if you want to maintain a PocketPC-style UI on
// Windows CE .NET. If 0, wxWindows will use a commandbar
// for the menubar, and a normal separate toolbar as per the
// desktop implementation. If 1, wxWindows will combine
// the toolbar and menubar as per the PocketPC implementation.
//
// Note that at present, the dynamic loading of PocketPC
// shell functions on WinCE .NET is not yet done, and a
// simple commandbar implementation is used instead of the
// PocketPC one. The intention is to use the PocketPC style
// when available (when wxUSE_POCKETPC_UI is 1).
//
// So if you're using WinCE .NET, and wxUSE_POCKETPC_UI is 0,
// you will be able to create separate toolbars and menubars,
// but _not_ the combined toolbar/menubar.
#define wxUSE_POCKETPC_UI 1
// ----------------------------------------------------------------------------
// obsolete settings
// ----------------------------------------------------------------------------