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

Added WCE toolbar

Browse Source 
Got menubars working with WCE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-07-18 14:12:53 +00:00
parent 560c9c2090
commit 39d2f9a7c8
12 changed files with 1647 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/msw/frame.cpp
View File

@@ -106,9 +106,6 @@ void wxFrame::Init()
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
#endif
#ifdef __WXWINCE__
m_commandBar = 0;
#endif
// Data to save/restore when calling ShowFullScreen
m_fsStatusBarFields = 0;
@@ -140,10 +137,6 @@ wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
DeleteAllBars();
#ifdef __WXWINCE__
RemoveCommandBar();
#endif
}
// ----------------------------------------------------------------------------
@@ -271,6 +264,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
}
else // set new non NULL menu bar
{
#ifndef __WXWINCE__
// Can set a menubar several times.
if ( menubar->GetHMenu() )
{
@@ -286,7 +280,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
return;
}
}
#endif
InternalSetMenuBar();
}
}
@@ -296,18 +290,14 @@ void wxFrame::InternalSetMenuBar()
#ifdef __WXMICROWIN__
// Nothing
#elif defined(__WXWINCE__)
CreateCommandBar() ;
if (m_commandBar)
if (!GetToolBar())
{
if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL,
(LPTSTR) (HMENU) m_hMenu, 0))
{
wxFAIL_MSG( _T("failed to set menubar") );
return;
}
CommandBar_DrawMenuBar((HWND) m_commandBar, 0);
wxToolBar* toolBar = new wxToolBar(this, -1,
wxDefaultPosition, wxDefaultSize,
wxBORDER_NONE | wxTB_HORIZONTAL,
wxToolBarNameStr, GetMenuBar());
SetToolBar(toolBar);
}
#else
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
@@ -434,6 +424,11 @@ bool wxFrame::ShowFullScreen(bool show, long style)
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
#ifdef __WXWINCE__
// We may already have a toolbar from calling SetMenuBar.
if (GetToolBar())
return GetToolBar();
#endif
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
PositionToolBar();
@@ -850,30 +845,3 @@ bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
return GetEventHandler()->ProcessEvent(event);
}
#ifdef __WXWINCE__
WXHWND wxFrame::CreateCommandBar()
{
if (m_commandBar)
return m_commandBar;
m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), GetHwnd(), NewControlId());
if (!m_commandBar)
{
wxFAIL_MSG( _T("failed to create commandbar") );
return 0;
}
return m_commandBar;
}
void wxFrame::RemoveCommandBar()
{
if (m_commandBar)
{
::DestroyWindow((HWND) m_commandBar);
m_commandBar = NULL;
}
}
#endif

132
src/msw/menu.cpp
View File

@@ -44,6 +44,20 @@
#include "wx/msw/private.h"
#ifdef __WXWINCE__
#include <windows.h>
#include <windowsx.h>
#include <tchar.h>
#include <ole2.h>
#include <commctrl.h>
#include <aygshell.h>
#ifndef TBSTYLE_NO_DROPDOWN_ARROW
#define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
#endif
#endif
// other standard headers
#include <string.h>
@@ -260,6 +274,10 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
id = pItem->GetId();
}
#ifdef __WXWINCE__
wxString strippedString;
#endif
LPCTSTR pData;
#if wxUSE_OWNER_DRAWN
@@ -274,7 +292,12 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
// menu is just a normal string (passed in data parameter)
flags |= MF_STRING;
#ifdef __WXWINCE__
strippedString = wxStripMenuCodes(pItem->GetText());
pData = (wxChar*)strippedString.c_str();
#else
pData = (wxChar*)pItem->GetText().c_str();
#endif
}
BOOL ok;
@@ -558,6 +581,9 @@ void wxMenuBar::Init()
{
m_eventHandler = this;
m_hMenu = 0;
#ifdef __WXWINCE__
m_toolBar = NULL;
#endif
}
wxMenuBar::wxMenuBar()
@@ -587,6 +613,9 @@ wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
wxMenuBar::~wxMenuBar()
{
// In Windows CE, the menubar is always associated
// with a toolbar, which destroys the menu implicitly.
#ifndef __WXWINCE__
// we should free Windows resources only if Windows doesn't do it for us
// which happens if we're attached to a frame
if (m_hMenu && !IsAttached())
@@ -594,6 +623,7 @@ wxMenuBar::~wxMenuBar()
::DestroyMenu((HMENU)m_hMenu);
m_hMenu = (WXHMENU)NULL;
}
#endif
}
// ---------------------------------------------------------------------------
@@ -604,11 +634,53 @@ void wxMenuBar::Refresh()
{
wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
#ifdef __WXWINCE__
if (GetToolBar())
{
CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0);
}
#else
DrawMenuBar(GetHwndOf(GetFrame()));
#endif
}
WXHMENU wxMenuBar::Create()
{
#ifdef __WXWINCE__
if ( m_hMenu != 0 )
return m_hMenu;
if (!GetToolBar())
return 0;
HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
if (hMenu)
{
TBBUTTON tbButton;
memset(&tbButton, 0, sizeof(TBBUTTON));
tbButton.iBitmap = I_IMAGENONE;
tbButton.fsState = TBSTATE_ENABLED;
tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
size_t i;
for (i = 0; i < GetMenuCount(); i++)
{
HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ;
tbButton.dwData = (DWORD)hPopupMenu;
wxString label = wxStripMenuCodes(GetLabelTop(i));
tbButton.iString = (int) label.c_str();
tbButton.idCommand = NewControlId();
if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton))
{
wxLogLastError(wxT("TB_INSERTBUTTON"));
}
}
}
m_hMenu = (WXHMENU) hMenu;
return m_hMenu;
#else
if ( m_hMenu != 0 )
return m_hMenu;
@@ -634,6 +706,7 @@ WXHMENU wxMenuBar::Create()
}
return m_hMenu;
#endif
}
// ---------------------------------------------------------------------------
@@ -768,13 +841,34 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
if ( IsAttached() )
{
#ifdef __WXWINCE__
if (!GetToolBar())
return FALSE;
TBBUTTON tbButton;
memset(&tbButton, 0, sizeof(TBBUTTON));
tbButton.iBitmap = I_IMAGENONE;
tbButton.fsState = TBSTATE_ENABLED;
tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
tbButton.dwData = (DWORD)hPopupMenu;
wxString label = wxStripMenuCodes(title);
tbButton.iString = (int) label.c_str();
tbButton.idCommand = NewControlId();
if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
{
wxLogLastError(wxT("TB_INSERTBUTTON"));
return FALSE;
}
#else
if ( !::InsertMenu(GetHmenu(), pos,
MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)GetHmenuOf(menu), title) )
{
wxLogLastError(wxT("InsertMenu"));
}
#endif
#if wxUSE_ACCEL
if ( menu->HasAccels() )
{
@@ -801,16 +895,39 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
if ( IsAttached() )
{
#ifdef __WXWINCE__
if (!GetToolBar())
return FALSE;
TBBUTTON tbButton;
memset(&tbButton, 0, sizeof(TBBUTTON));
tbButton.iBitmap = I_IMAGENONE;
tbButton.fsState = TBSTATE_ENABLED;
tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
size_t pos = GetMenuCount();
HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
tbButton.dwData = (DWORD)hPopupMenu;
wxString label = wxStripMenuCodes(title);
tbButton.iString = (int) label.c_str();
tbButton.idCommand = NewControlId();
if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
{
wxLogLastError(wxT("TB_INSERTBUTTON"));
return FALSE;
}
#else
if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
(UINT)submenu, title) )
{
wxLogLastError(wxT("AppendMenu"));
}
#endif
#if wxUSE_ACCEL
if ( menu->HasAccels() )
{
// need to rebuild accell table
// need to rebuild accelerator table
RebuildAccelTable();
}
#endif // wxUSE_ACCEL
@@ -829,11 +946,20 @@ wxMenu *wxMenuBar::Remove(size_t pos)
if ( IsAttached() )
{
#ifdef __WXWINCE__
if (GetToolBar())
{
if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0))
{
wxLogLastError(wxT("TB_DELETEBUTTON"));
}
}
#else
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
wxLogLastError(wxT("RemoveMenu"));
}
#endif
#if wxUSE_ACCEL
if ( menu->HasAccels() )
{

4
src/msw/settings.cpp
View File

@@ -200,7 +200,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
if ( !hasCol )
{
#ifdef __WXWINCE__
colSys = ::GetSysColor(index|SYS_COLOR_INDEX_FLAG);
#else
colSys = ::GetSysColor(index);
#endif
}
return wxRGBToColour(colSys);

11
src/msw/toplevel.cpp
View File

@@ -156,7 +156,12 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
if ( style & wxFRAME_TOOL_WINDOW )
msflags |= WS_POPUP;
else
msflags |= WS_OVERLAPPED;
{
#ifdef __WXWINCE__
if (msflags & WS_BORDER)
#endif
msflags |= WS_OVERLAPPED;
}
// border and caption styles
if ( style & wxRESIZE_BORDER )
@@ -167,13 +172,17 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
}
else if ( !(style & wxBORDER_NONE) )
msflags |= WS_BORDER;
#ifndef __WXWINCE__
else
msflags |= WS_POPUP;
#endif
if ( style & wxCAPTION )
msflags |= WS_CAPTION;
#ifndef __WXWINCE__
else
msflags |= WS_POPUP;
#endif
// next translate the individual flags
if ( style & wxMINIMIZE_BOX )

1258
src/msw/wince/tbarwce.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

43
src/msw/window.cpp
View File

@@ -2978,18 +2978,37 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
// do create the window
wxWindowCreationHook hook(this);
m_hWnd = (WXHWND)::CreateWindowEx
(
extendedStyle,
className,
title ? title : wxEmptyString,
style,
x, y, w, h,
(HWND)MSWGetParent(),
(HMENU)controlId,
wxGetInstance(),
NULL // no extra data
);
#ifdef __WXWINCE__
if (extendedStyle == 0)
{
m_hWnd = (WXHWND)::CreateWindow
(
className,
title ? title : wxEmptyString,
style,
x, y, w, h,
(HWND)MSWGetParent(),
(HMENU)controlId,
wxGetInstance(),
NULL // no extra data
);
}
else
#endif
{
m_hWnd = (WXHWND)::CreateWindowEx
(
extendedStyle,
className,
title ? title : wxEmptyString,
style,
x, y, w, h,
(HWND)MSWGetParent(),
(HMENU)controlId,
wxGetInstance(),
NULL // no extra data
);
}
if ( !m_hWnd )
{