#include "wx/dynarray.h"
+// Smartphones don't have toolbars, so use a dummy class
+#ifdef __SMARTPHONE__
+
class WXDLLEXPORT wxToolBar : public wxToolBarBase
{
public:
// ctors and dtor
- wxToolBar() { Init(); }
+ wxToolBar() { }
wxToolBar(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER | wxTB_HORIZONTAL,
+ const wxString& name = wxToolBarNameStr)
+ {
+ Create(parent, id, pos, size, style, name);
+ }
+
+ bool Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER | wxTB_HORIZONTAL,
+ const wxString& name = wxToolBarNameStr);
+
+ // override/implement base class virtuals
+ virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+ virtual bool Realize() { return true; }
+
+protected:
+ // 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);
+
+private:
+ DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS(wxToolBar)
+ DECLARE_NO_COPY_CLASS(wxToolBar)
+};
+
+#else
+
+// For __POCKETPC__
+
+#include "wx/msw/tbar95.h"
+
+class WXDLLEXPORT wxToolMenuBar : public wxToolBar
+{
+public:
+ // ctors and dtor
+ wxToolMenuBar() { Init(); }
+
+ wxToolMenuBar(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL);
- virtual ~wxToolBar();
+ virtual ~wxToolMenuBar();
// 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();
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 wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
- // override WndProc mainly to process WM_SIZE
- virtual WXLRESULT 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 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)
+ DECLARE_DYNAMIC_CLASS(wxToolMenuBar)
+ DECLARE_NO_COPY_CLASS(wxToolMenuBar)
};
+#endif
+ // __SMARTPHONE__
+
#endif // wxUSE_TOOLBAR
#endif
#include "wx/msw/winundef.h"
-#if defined(__MWERKS__) && defined(__WXMSW__)
-// including <windef.h> for max definition doesn't seem
-// to work using CodeWarrior 6 Windows. So we define it
-// here. (Otherwise we get a undefined identifier 'max'
-// later on in this file.) (Added by dimitri@shortcut.nl)
-# ifndef max
-# define max(a,b) (((a) > (b)) ? (a) : (b))
-# endif
-
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// these standard constants are not always defined in compilers headers
-
-// Styles
-#ifndef TBSTYLE_FLAT
- #define TBSTYLE_LIST 0x1000
- #define TBSTYLE_FLAT 0x0800
-#endif
-
-#ifndef TBSTYLE_TRANSPARENT
- #define TBSTYLE_TRANSPARENT 0x8000
-#endif
-
-#ifndef TBSTYLE_TOOLTIPS
- #define TBSTYLE_TOOLTIPS 0x0100
-#endif
-
-// Messages
-#ifndef TB_GETSTYLE
- #define TB_SETSTYLE (WM_USER + 56)
- #define TB_GETSTYLE (WM_USER + 57)
-#endif
-
-#ifndef TB_HITTEST
- #define TB_HITTEST (WM_USER + 69)
-#endif
+#if !defined(__SMARTPHONE__)
-// these values correspond to those used by comctl32.dll
-#define DEFAULTBITMAPX 16
-#define DEFAULTBITMAPY 15
-#define DEFAULTBUTTONX 24
-#define DEFAULTBUTTONY 24
-#define DEFAULTBARHEIGHT 27
+///////////// This implementation is for PocketPC.
+///////////// See later for the Smartphone dummy toolbar class.
// ----------------------------------------------------------------------------
-// wxWin macros
+// Event table
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolMenuBar, wxToolBar)
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
- EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
- EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxToolMenuBar, wxToolBar)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
-class wxToolBarTool : public wxToolBarToolBase
+class wxToolMenuBarTool : public wxToolBarToolBase
{
public:
- wxToolBarTool(wxToolBar *tbar,
+ wxToolMenuBarTool(wxToolBar *tbar,
int id,
const wxString& label,
const wxBitmap& bmpNormal,
m_bitmapIndex = -1;
}
- wxToolBarTool(wxToolBar *tbar, wxControl *control)
+ wxToolMenuBarTool(wxToolBar *tbar, wxControl *control)
: wxToolBarToolBase(tbar, control)
{
m_nSepCount = 1;
// wxToolBarTool
// ----------------------------------------------------------------------------
-wxToolBarToolBase *wxToolBar::CreateTool(int id,
+wxToolBarToolBase *wxToolMenuBar::CreateTool(int id,
const wxString& label,
const wxBitmap& bmpNormal,
const wxBitmap& bmpDisabled,
const wxString& shortHelp,
const wxString& longHelp)
{
- return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+ return new wxToolMenuBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
clientData, shortHelp, longHelp);
}
-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *wxToolMenuBar::CreateTool(wxControl *control)
{
- return new wxToolBarTool(this, control);
+ return new wxToolMenuBarTool(this, control);
}
// ----------------------------------------------------------------------------
// wxToolBar construction
// ----------------------------------------------------------------------------
-void wxToolBar::Init()
+void wxToolMenuBar::Init()
{
- m_nButtons = 0;
-
- m_defaultWidth = DEFAULTBITMAPX;
- m_defaultHeight = DEFAULTBITMAPY;
-
- m_pInTool = 0;
+ wxToolBar::Init();
+
+ m_nButtons = 0;
m_menuBar = NULL;
}
-bool wxToolBar::Create(wxWindow *parent,
+bool wxToolMenuBar::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
return true;
}
-#ifndef TBSTYLE_NO_DROPDOWN_ARROW
-#define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
-#endif
-
-bool wxToolBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), wxMenuBar* menuBar)
+bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), wxMenuBar* menuBar)
{
SetMenuBar(menuBar);
if (m_menuBar)
m_menuBar->SetToolBar(this);
- // Smartphone doesn't show a toolbar, it uses menu buttons.
-
-#if !defined(__SMARTPHONE__)
-
#if defined(WINCE_WITHOUT_COMMANDBAR)
// Create the menubar.
SHMENUBARINFO mbi;
if (menuBar)
menuBar->Create();
-#endif
- // __SMARTPHONE__
return true;
}
-void wxToolBar::Recreate()
+void wxToolMenuBar::Recreate()
{
-#if 0
- const HWND hwndOld = GetHwnd();
- if ( !hwndOld )
- {
- // we haven't been created yet, no need to recreate
- return;
- }
-
- // get the position and size before unsubclassing the old toolbar
- const wxPoint pos = GetPosition();
- const wxSize size = GetSize();
-
- UnsubclassWin();
-
- if ( !MSWCreateToolbar(pos, size) )
- {
- // what can we do?
- wxFAIL_MSG( _T("recreating the toolbar failed") );
-
- return;
- }
-
- // reparent all our children under the new toolbar
- for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
- node;
- node = node->GetNext() )
- {
- wxWindow *win = node->GetData();
- if ( !win->IsTopLevel() )
- ::SetParent(GetHwndOf(win), GetHwnd());
- }
-
- // only destroy the old toolbar now -- after all the children had been
- // reparented
- ::DestroyWindow(hwndOld);
-
- Realize();
- UpdateSize();
-#endif
+ // TODO
}
-wxToolBar::~wxToolBar()
+wxToolMenuBar::~wxToolMenuBar()
{
if (GetMenuBar())
GetMenuBar()->SetToolBar(NULL);
-
- // we must refresh the frame size when the toolbar is deleted but the frame
- // is not - otherwise toolbar leaves a hole in the place it used to occupy
- wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
- if ( frame && !frame->IsBeingDeleted() )
- {
- frame->SendSizeEvent();
- }
-}
-
-wxSize wxToolBar::DoGetBestSize() const
-{
- wxSize sizeBest = GetToolSize();
- sizeBest.x *= GetToolsCount();
-
- // reverse horz and vertical components if necessary
- return HasFlag(wxTB_VERTICAL) ? wxSize(sizeBest.y, sizeBest.x) : sizeBest;
}
// Return HMENU for the menu associated with the commandbar
-WXHMENU wxToolBar::GetHMenu()
+WXHMENU wxToolMenuBar::GetHMenu()
{
#if defined(__HANDHELDPC__)
- // TODO ???
return 0;
#else
if (GetHWND())
#endif
}
-
-WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
- // toolbars never have border, giving one to them results in broken
- // appearance
- WXDWORD msStyle = wxControl::MSWGetStyle
- (
- (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
- );
-
- // always include this one, it never hurts and setting it later only if we
- // do have tooltips wouldn't work
- msStyle |= TBSTYLE_TOOLTIPS;
-
- if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
- {
- // static as it doesn't change during the program lifetime
- static int s_verComCtl = wxTheApp->GetComCtl32Version();
-
- // comctl32.dll 4.00 doesn't support the flat toolbars and using this
- // style with 6.00 (part of Windows XP) leads to the toolbar with
- // incorrect background colour - and not using it still results in the
- // correct (flat) toolbar, so don't use it there
- if ( s_verComCtl > 400 && s_verComCtl < 600 )
- {
- msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
- }
-
- if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
- {
- msStyle |= TBSTYLE_LIST;
- }
- }
-
- if ( style & wxTB_NODIVIDER )
- msStyle |= CCS_NODIVIDER;
-
- if ( style & wxTB_NOALIGN )
- msStyle |= CCS_NOPARENTALIGN;
-
- if ( style & wxTB_VERTICAL )
- msStyle |= CCS_VERT;
-
- return msStyle;
-}
-
// ----------------------------------------------------------------------------
// adding/removing tools
// ----------------------------------------------------------------------------
-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
+bool wxToolMenuBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
{
// nothing special to do here - we really create the toolbar buttons in
// Realize() later
return true;
}
-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+bool wxToolMenuBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
{
// the main difficulty we have here is with the controls in the toolbars:
// as we (sometimes) use several separators to cover up the space used by
if ( tool2->IsControl() )
{
- pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
+ pos += ((wxToolMenuBarTool *)tool2)->GetSeparatorsCount() - 1;
}
}
if ( tool->IsControl() )
{
- nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
+ nButtonsToDelete = ((wxToolMenuBarTool *)tool)->GetSeparatorsCount();
width *= nButtonsToDelete;
}
return true;
}
-bool wxToolBar::Realize()
+bool wxToolMenuBar::Realize()
{
-#if defined(__SMARTPHONE__)
- return true;
-#else
const size_t nTools = GetToolsCount();
if ( nTools == 0 )
{
wxToolBarToolsList::Node* node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
- wxToolBarTool *tool = (wxToolBarTool*) node->GetData();
+ wxToolMenuBarTool *tool = (wxToolMenuBarTool*) node->GetData();
TBBUTTON buttons[1] ;
}
return true;
-#endif
- // __SMARTPHONE__
}
-// ----------------------------------------------------------------------------
-// message handlers
-// ----------------------------------------------------------------------------
-
-bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
+bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
{
wxToolBarToolBase *tool = FindById((int)id);
if ( !tool )
return true;
}
-bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
- WXLPARAM lParam,
- WXLPARAM *WXUNUSED(result))
-{
-#if wxUSE_TOOLTIPS
- // First check if this applies to us
- NMHDR *hdr = (NMHDR *)lParam;
-
- // the tooltips control created by the toolbar is sometimes Unicode, even
- // in an ANSI application - this seems to be a bug in comctl32.dll v5
- UINT code = hdr->code;
- if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
- return false;
-
- HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
- if ( toolTipWnd != hdr->hwndFrom )
- return false;
-
- LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
- int id = (int)ttText->hdr.idFrom;
-
- wxToolBarToolBase *tool = FindById(id);
- if ( !tool )
- return false;
-
- return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
#else
- wxUnusedVar(lParam);
- return false;
-#endif
-}
+
+////////////// For Smartphone
// ----------------------------------------------------------------------------
-// toolbar geometry
+// Event table
// ----------------------------------------------------------------------------
-void wxToolBar::SetToolBitmapSize(const wxSize& size)
-{
- wxToolBarBase::SetToolBitmapSize(size);
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
- ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
-}
+BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+END_EVENT_TABLE()
-void wxToolBar::SetRows(int nRows)
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ wxObject *clientData,
+ const wxString& shortHelp,
+ const wxString& longHelp)
{
- if ( nRows == m_maxRows )
- {
- // avoid resizing the frame uselessly
- return;
- }
-
- // TRUE in wParam means to create at least as many rows, FALSE -
- // at most as many
- RECT rect;
- ::SendMessage(GetHwnd(), TB_SETROWS,
- MAKEWPARAM(nRows, !(GetWindowStyle() & wxTB_VERTICAL)),
- (LPARAM) &rect);
-
- m_maxRows = nRows;
-
- UpdateSize();
+ return new wxToolBarToolBase(this, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp);
}
-// The button size is bigger than the bitmap size
-wxSize wxToolBar::GetToolSize() const
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
{
- // TB_GETBUTTONSIZE is supported from version 4.70
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
- && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
- if ( wxTheApp->GetComCtl32Version() >= 470 )
- {
- DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
-
- return wxSize(LOWORD(dw), HIWORD(dw));
- }
- else
-#endif // comctl32.dll 4.70+
- {
- // defaults
- return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
- }
+ return new wxToolBarToolBase(this, control);
}
-static
-wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
- size_t index )
+bool wxToolBar::Create(wxWindow *parent,
+ wxWindowID WXUNUSED(id),
+ const wxPoint& WXUNUSED(pos),
+ const wxSize& WXUNUSED(size),
+ long style,
+ const wxString& name)
{
- wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
-
- for ( ; current != 0; current = current->GetNext() )
- {
- if ( index == 0 )
- return current->GetData();
-
- wxToolBarTool *tool = (wxToolBarTool *)current->GetData();
- size_t separators = tool->GetSeparatorsCount();
-
- // if it is a normal button, sepcount == 0, so skip 1 item (the button)
- // otherwise, skip as many items as the separator count, plus the
- // control itself
- index -= separators ? separators + 1 : 1;
- }
+ // TODO: we may need to make this a dummy hidden window to
+ // satisfy other parts of wxWidgets.
- return 0;
+ parent->AddChild(this);
+
+ SetWindowStyle(style);
+ SetName(name);
+
+ return true;
}
-wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
-{
- POINT pt;
- pt.x = x;
- pt.y = y;
- int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
- // MBN: when the point ( x, y ) is close to the toolbar border
- // TB_HITTEST returns m_nButtons ( not -1 )
- if ( index < 0 || (size_t)index >= m_nButtons )
- {
- // it's a separator or there is no tool at all there
- return (wxToolBarToolBase *)NULL;
- }
+// ----------------------------------------------------------------------------
+// adding/removing tools
+// ----------------------------------------------------------------------------
- // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
- if ( wxTheApp->GetComCtl32Version() >= 471 )
- {
- return m_tools.Item((size_t)index)->GetData();
- }
- else
-#endif
- {
- return GetItemSkippingDummySpacers( m_tools, (size_t) index );
- }
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
+{
+ tool->Attach(this);
+ return true;
}
-void wxToolBar::UpdateSize()
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
{
- // the toolbar size changed
- ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
-
- // we must also refresh the frame after the toolbar size (possibly) changed
- wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
- if ( frame )
- {
- frame->SendSizeEvent();
- }
+ tool->Detach();
+ return true;
}
-// ----------------------------------------------------------------------------
-// toolbar styles
-// ---------------------------------------------------------------------------
-
-void wxToolBar::SetWindowStyleFlag(long style)
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) const
{
- // the style bits whose changes force us to recreate the toolbar
- static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
-
- const long styleOld = GetWindowStyle();
-
- wxToolBarBase::SetWindowStyleFlag(style);
-
- // don't recreate an empty toolbar: not only this is unnecessary, but it is
- // also fatal as we'd then try to recreate the toolbar when it's just being
- // created
- if ( GetToolsCount() &&
- (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
- {
- // to remove the text labels, simply re-realizing the toolbar is enough
- // but I don't know of any way to add the text to an existing toolbar
- // other than by recreating it entirely
- Recreate();
- }
+ return NULL;
}
// ----------------------------------------------------------------------------
// tool state
// ----------------------------------------------------------------------------
-void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
+void wxToolBar::DoEnableTool(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(enable))
{
- ::SendMessage(GetHwnd(), TB_ENABLEBUTTON,
- (WPARAM)tool->GetId(), (LPARAM)MAKELONG(enable, 0));
}
-void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle)
+void wxToolBar::DoToggleTool(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
{
- ::SendMessage(GetHwnd(), TB_CHECKBUTTON,
- (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0));
}
void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
{
- // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
- // without, so we really need to delete the button and recreate it here
wxFAIL_MSG( _T("not implemented") );
}
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// Responds to colour changes, and passes event on to children.
-void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
- wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
-
- // Remap the buttons
- Realize();
-
- // Relayout the toolbar
- int nrows = m_maxRows;
- m_maxRows = 0; // otherwise SetRows() wouldn't do anything
- SetRows(nrows);
-
- Refresh();
-
- // let the event propagate further
- event.Skip();
-}
-
-void wxToolBar::OnMouseEvent(wxMouseEvent& event)
-{
- if (event.Leaving() && m_pInTool)
- {
- OnMouseEnter( -1 );
- event.Skip();
- return;
- }
-
- if (event.RightDown())
- {
- // For now, we don't have an id. Later we could
- // try finding the tool.
- OnRightClick((int)-1, event.GetX(), event.GetY());
- }
- else
- {
- event.Skip();
- }
-}
-
-void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
-{
- wxCoord x = GET_X_LPARAM(lParam),
- y = GET_Y_LPARAM(lParam);
- wxToolBarToolBase* tool = FindToolForPosition( x, y );
-
- // cursor left current tool
- if( tool != m_pInTool && !tool )
- {
- m_pInTool = 0;
- OnMouseEnter( -1 );
- }
-
- // cursor entered a tool
- if( tool != m_pInTool && tool )
- {
- m_pInTool = tool;
- OnMouseEnter( tool->GetId() );
- }
-}
+#endif
+ // !__SMARTPHONE__
-WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if 0
- switch ( nMsg )
- {
- case WM_SIZE:
- if ( HandleSize(wParam, lParam) )
- return 0;
- break;
- case WM_MOUSEMOVE:
- // we don't handle mouse moves, so always pass the message to
- // wxControl::MSWWindowProc
- HandleMouseMove(wParam, lParam);
- break;
- }
-#endif
- return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
#endif // wxUSE_TOOLBAR && Win95
projects / wxWidgets.git / commitdiff
