AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/msw/frame.h
View File

@ -102,12 +102,6 @@ public:
// current size - this has an effect of refreshing the window layout
virtual void SendSizeEvent();
#ifdef __WXWINCE__
WXHWND GetCommandBar() { return m_commandBar; }
WXHWND CreateCommandBar() ;
void RemoveCommandBar() ;
#endif
protected:
// common part of all ctors
void Init();
@ -155,9 +149,6 @@ private:
#if wxUSE_TOOLTIPS
WXHWND m_hwndToolTip;
#endif // tooltips
#ifdef __WXWINCE__
WXHWND m_commandBar;
#endif
// used by IconizeChildFrames(), see comments there
bool m_wasMinimized;

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

@ -25,6 +25,10 @@
class WXDLLEXPORT wxFrame;
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
class WXDLLEXPORT wxToolBar;
#endif
// ----------------------------------------------------------------------------
// Menu
// ----------------------------------------------------------------------------
@ -153,6 +157,12 @@ public:
virtual void Detach();
virtual void Attach(wxFrame *frame);
#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 wxUSE_ACCEL
// get the accel table for all the menus
const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
@ -189,6 +199,10 @@ protected:
wxAcceleratorTable m_accelTable;
#endif // wxUSE_ACCEL
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
wxToolBar* m_toolBar;
#endif
private:
DECLARE_DYNAMIC_CLASS(wxMenuBar)
};

148
include/wx/msw/wince/tbarwce.h Normal file
View File

@ -0,0 +1,148 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wince/tbarwce.h
// Purpose: Windows CE wxToolBar class
// Author: Julian Smart
// Modified by:
// Created: 2003-07-12
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BARWCE_H_
#define _WX_BARWCE_H_
#ifdef __GNUG__
#pragma interface "tbarwce.h"
#endif
#if wxUSE_TOOLBAR
#include "wx/dynarray.h"
class WXDLLEXPORT wxToolBar : public wxToolBarBase
{
public:
// ctors and dtor
wxToolBar() { Init(); }
wxToolBar(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL)
{
Init();
Create(parent, id, pos, size, style, name, menuBar);
}
bool Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL);
virtual ~wxToolBar();
// override/implement base class virtuals
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
virtual bool Realize();
virtual void SetToolBitmapSize(const wxSize& size);
virtual wxSize GetToolSize() const;
virtual void SetRows(int nRows);
// implementation only from now on
// -------------------------------
virtual void SetWindowStyleFlag(long style);
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
void OnMouseEvent(wxMouseEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
void SetFocus() {}
static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
// Return HMENU for the menu associated with the commandbar
WXHMENU GetHMenu();
// Set the wxMenuBar associated with this commandbar
void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
// Returns the wxMenuBar associated with this commandbar
wxMenuBar* GetMenuBar() const { return m_menuBar; }
protected:
// common part of all ctors
void Init();
// create the native toolbar control
bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuBar* menuBar);
// recreate the control completely
void Recreate();
// implement base class pure virtuals
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
virtual wxToolBarToolBase *CreateTool(int id,
const wxString& label,
const wxBitmap& bmpNormal,
const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
// override WndProc mainly to process WM_SIZE
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
// return the appropriate size and flags for the toolbar control
virtual wxSize DoGetBestSize() const;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
// handlers for various events
void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
// should be called whenever the toolbar size changes
void UpdateSize();
// the big bitmap containing all bitmaps of the toolbar buttons
WXHBITMAP m_hBitmap;
// the total number of toolbar elements
size_t m_nButtons;
// the tool the cursor is in
wxToolBarToolBase *m_pInTool;
// The menubar associated with this toolbar
wxMenuBar* m_menuBar;
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolBar)
DECLARE_NO_COPY_CLASS(wxToolBar)
};
#endif // wxUSE_TOOLBAR
#endif
// _WX_BARWCE_H_

32
include/wx/msw/wx.rc
View File

@ -35,6 +35,10 @@
#include <windows.h>
#endif
#if defined(_WIN32_WCE)
#include <commctrl.h>
#endif
//////////////////////////////////////////////////////////////////////////////
//
// This is the MDI Window menu
@ -53,6 +57,34 @@ BEGIN
END
END
#ifdef _WIN32_WCE
// Dummy menubar/toolbar for WinCE
5000 RCDATA DISCARDABLE
BEGIN
// Popup menu name
5000,
// Count of items to put on the menu
0
END
5000 MENU DISCARDABLE
BEGIN
POPUP "Dummy"
BEGIN
MENUITEM "Dummy" 99
END
END
STRINGTABLE DISCARDABLE
BEGIN
5001 "Dummy menu"
END
#endif
//////////////////////////////////////////////////////////////////////////////
//
// Standard wxWindows Cursors

2
include/wx/toolbar.h
View File

@ -121,6 +121,8 @@ enum
#else // wxUSE_TOOLBAR_NATIVE
#if defined(__WXUNIVERSAL__)
#include "wx/univ/toolbar.h"
#elif defined(__WXWINCE__)
#include "wx/msw/wince/tbarwce.h"
#elif defined(__WXMSW__) && defined(__WIN95__)
#include "wx/msw/tbar95.h"
#elif defined(__WXMSW__)

8
samples/minimal/minimal.cpp
View File

@ -121,7 +121,11 @@ bool MyApp::OnInit()
{
// create the main application window
MyFrame *frame = new MyFrame(_T("Minimal wxWindows App"),
wxPoint(50, 50), wxSize(450, 340));
#ifdef __WXWINCE__
wxPoint(0, 0), wxDefaultSize, wxNO_BORDER);
#else
wxPoint(50, 50), wxSize(450, 340));
#endif
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
@ -163,7 +167,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
SetMenuBar(menuBar);
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
#if wxUSE_STATUSBAR && !defined(__WXWINCE__)
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
SetStatusText(_T("Welcome to wxWindows!"));

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 )
{