// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#endif
#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
#endif
-#if USE_BUTTONBAR && USE_TOOLBAR && defined(__WIN95__)
+#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
#include "malloc.h"
#endif
#include <windows.h>
-#ifndef __GNUWIN32__
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
#include <commctrl.h>
#endif
+#ifndef __TWIN32__
#ifdef __GNUWIN32__
#include "wx/msw/gnuwin32/extra.h"
#endif
+#endif
#include "wx/msw/dib.h"
#include "wx/tbar95.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
+#endif
BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
- EVT_SIZE(wxToolBar95::OnSize)
- EVT_PAINT(wxToolBar95::OnPaint)
- EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
- EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
+ EVT_SIZE(wxToolBar95::OnSize)
+ EVT_PAINT(wxToolBar95::OnPaint)
+ EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
+ EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
-void wxMapBitmap(HBITMAP hBitmap, int width, int height);
+static void wxMapBitmap(HBITMAP hBitmap, int width, int height);
-wxToolBar95::wxToolBar95(void)
+wxToolBar95::wxToolBar95()
{
m_maxWidth = -1;
m_maxHeight = -1;
m_defaultHeight = DEFAULTBITMAPY;
}
-bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style, const wxString& name)
+bool wxToolBar95::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
+ GetGValue(GetSysColor(COLOR_BTNFACE)),
+ GetBValue(GetSysColor(COLOR_BTNFACE)));
m_foregroundColour = *wxBLACK ;
- m_defaultForegroundColour = *wxBLACK ;
- m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
+ wxASSERT_MSG( (style & wxTB_VERTICAL) == 0,
+ "Sorry, wxToolBar95 under Windows 95 only "
+ "supports horizontal orientation." );
- if (style & wxTB_VERTICAL)
- wxMessageBox("Sorry, wxToolBar95 under Windows 95 only supports horizontal orientation.", "wxToolBar95 usage", wxOK);
m_maxWidth = -1;
m_maxHeight = -1;
-
+
m_hBitmap = 0;
m_defaultWidth = DEFAULTBITMAPX;
m_defaultHeight = DEFAULTBITMAPY;
SetName(name);
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
m_windowStyle = style;
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-
SetParent(parent);
- DWORD msflags = 0;
- if (style & wxBORDER)
- msflags |= WS_BORDER;
- msflags |= WS_CHILD | WS_VISIBLE;
-
+ int x = pos.x;
+ int y = pos.y;
+ int width = size.x;
+ int height = size.y;
+
if (width <= 0)
width = 100;
if (height <= 0)
y = 0;
m_windowId = (id < 0 ? NewControlId() : id);
- DWORD msStyle = WS_CHILD | WS_BORDER | WS_VISIBLE | TBSTYLE_TOOLTIPS;
+ DWORD msflags = 0;
+ if (style & wxBORDER)
+ msflags |= WS_BORDER;
+ msflags |= WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS;
if (style & wxTB_FLAT)
{
if (wxTheApp->GetComCtl32Version() > 400)
- msStyle |= TBSTYLE_FLAT;
+ msflags |= TBSTYLE_FLAT;
}
+ bool want3D;
+ WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+
+ // Even with extended styles, need to combine with WS_BORDER
+ // for them to look right.
+ if ( want3D || wxStyleHasBorder(m_windowStyle) )
+ msflags |= WS_BORDER;
+
// Create the toolbar control.
- HWND hWndToolbar = CreateWindowEx(0L, // No extended styles.
- TOOLBARCLASSNAME, // Class name for the toolbar.
- "", // No default text.
- msStyle, // Styles and defaults.
- x, y, width, height, // Standard toolbar size and position.
- (HWND) parent->GetHWND(), // Parent window of the toolbar.
- (HMENU)m_windowId, // Toolbar ID.
- wxGetInstance(), // Current instance.
- NULL ); // No class data.
+ HWND hWndToolbar = CreateWindowEx
+ (
+ exStyle, // Extended styles.
+ TOOLBARCLASSNAME, // Class name for the toolbar.
+ "", // No default text.
+ msflags, // Styles
+ x, y, width, height, // Standard toolbar size and position.
+ (HWND) parent->GetHWND(), // Parent window of the toolbar.
+ (HMENU)m_windowId, // Toolbar ID.
+ wxGetInstance(), // Current instance.
+ NULL // No class data.
+ );
+
+ wxCHECK_MSG( hWndToolbar, FALSE, "Toolbar creation failed" );
// Toolbar-specific initialisation
- ::SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), (LPARAM)0);
+ ::SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE,
+ (WPARAM)sizeof(TBBUTTON), (LPARAM)0);
m_hWnd = (WXHWND) hWndToolbar;
- if (parent) parent->AddChild(this);
-
- SubclassWin((WXHWND) hWndToolbar);
+ if (parent)
+ parent->AddChild(this);
+
+ SubclassWin((WXHWND)hWndToolbar);
return TRUE;
}
-wxToolBar95::~wxToolBar95(void)
+wxToolBar95::~wxToolBar95()
{
UnsubclassWin();
}
}
-bool wxToolBar95::CreateTools(void)
+bool wxToolBar95::CreateTools()
{
if (m_tools.Number() == 0)
return FALSE;
HBITMAP oldToolBarBitmap = (HBITMAP) m_hBitmap;
-
+
int totalBitmapWidth = (int)(m_defaultWidth * m_tools.Number());
int totalBitmapHeight = (int)m_defaultHeight;
HDC dc = ::GetDC(NULL);
m_hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap(dc, totalBitmapWidth, totalBitmapHeight);
::ReleaseDC(NULL, dc);
-
+
// Now blit all the tools onto this bitmap
HDC memoryDC = ::CreateCompatibleDC(NULL);
HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, (HBITMAP) m_hBitmap);
HBITMAP oldBitmap2 = (HBITMAP) ::SelectObject(memoryDC2, (HBITMAP) tool->m_bitmap1.GetHBITMAP());
/* int bltResult = */
- BitBlt(memoryDC, x, 0, (int) m_defaultWidth, (int) m_defaultHeight, memoryDC2,
+ BitBlt(memoryDC, x, 0, (int) m_defaultWidth, (int) m_defaultHeight, memoryDC2,
0, 0, SRCCOPY);
::SelectObject(memoryDC2, oldBitmap2);
x += (int)m_defaultWidth;
bitmapId ++;
}
-
+
i ++;
node = node->Next();
}
- int ans = (int)::SendMessage((HWND) GetHWND(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)& buttons);
- ans = (int)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);
+ long rc = ::SendMessage((HWND) GetHWND(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)& buttons);
- RECT rect;
- ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_maxRows, TRUE), (LPARAM) & rect);
- m_maxWidth = (rect.right - rect.left + 2);
- m_maxHeight = (rect.bottom - rect.top + 2);
+ wxCHECK_MSG( rc, FALSE, "failed to add buttons to the toolbar" );
+
+ (void)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);
+
+ SetRows(m_maxRows);
return TRUE;
}
return TRUE;
}
-bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
+ WXLPARAM lParam,
+ WXLPARAM *result)
{
- // First check if this applies to us
+ // First check if this applies to us
NMHDR *hdr = (NMHDR *)lParam;
- if (hdr->code != TTN_NEEDTEXT)
- return FALSE;
- HWND toolTipWnd = (HWND) ::SendMessage((HWND) GetHWND(), TB_GETTOOLTIPS, 0, 0);
- if ( toolTipWnd != hdr->hwndFrom )
- return FALSE;
+ // the tooltips control created by the toolbar is sometimes Unicode, even in
+ // an ANSI application
+ if ( (hdr->code != TTN_NEEDTEXTA) && (hdr->code != TTN_NEEDTEXTW) )
+ return FALSE;
- LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT) lParam;
- int id = (int)ttText->hdr.idFrom;
- wxNode *node = m_tools.Find((long)id);
- if (!node)
- return FALSE;
-
- wxToolBarTool *tool = (wxToolBarTool *)node->Data();
+ HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
+ if ( toolTipWnd != hdr->hwndFrom )
+ return FALSE;
- switch (ttText->hdr.code)
- {
- case TTN_NEEDTEXT:
- {
- if (tool->m_shortHelpString != "")
- ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
+ LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
+ int id = (int)ttText->hdr.idFrom;
+ wxNode *node = m_tools.Find((long)id);
+ if (!node)
+ return FALSE;
- // For backward compatibility...
- OnMouseEnter(tool->m_index);
- break;
+ wxToolBarTool *tool = (wxToolBarTool *)node->Data();
+
+ if ( tool->m_shortHelpString != "" )
+ {
+ if ( hdr->code == TTN_NEEDTEXTA )
+ {
+ ttText->lpszText = (char *)(const char *)tool->m_shortHelpString;
+ }
+#if (_WIN32_IE >= 0x0300)
+ else
+ {
+ // FIXME this is a temp hack only until I understand better what
+ // must be done in both ANSI and Unicode builds
+ size_t lenAnsi = tool->m_shortHelpString.Len();
+ #ifdef __MWERKS__
+ wchar_t *pwz = new wchar_t[lenAnsi * 2 + 1];
+ #else
+ size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi);
+ wchar_t *pwz = new wchar_t[lenUnicode + 1];
+ #endif
+ mbstowcs(pwz, tool->m_shortHelpString, lenAnsi + 1);
+ memcpy(ttText->szText, pwz,
+ (sizeof(ttText->szText) - 1)/sizeof(ttText->szText[0]));
+ ttText->szText[WXSIZEOF(ttText->szText)] = 0;
+
+ delete [] pwz;
+ }
+#endif // _WIN32_IE >= 0x0300
}
- default:
- return FALSE;
- break;
- }
-
- return TRUE;
+
+ // For backward compatibility...
+ OnMouseEnter(tool->m_index);
+
+ return TRUE;
}
void wxToolBar95::SetToolBitmapSize(const wxSize& size)
{
- m_defaultWidth = size.x; m_defaultHeight = size.y;
+ m_defaultWidth = size.x;
+ m_defaultHeight = size.y;
::SendMessage((HWND) GetHWND(), TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG ((int)size.x, (int)size.y));
}
m_maxHeight = (rect.bottom - rect.top + 2);
}
-wxSize wxToolBar95::GetMaxSize(void) const
+wxSize wxToolBar95::GetMaxSize() const
{
- if (m_maxWidth == -1 | m_maxHeight == -1)
+ if ((m_maxWidth == -1) || (m_maxHeight == -1))
{
RECT rect;
::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_maxRows, TRUE), (LPARAM) & rect);
wxWindow::GetSize(w, h);
// For some reason, the returned height is several pixels bigger than that
// displayed!
- *h -= 2;
+ // Taking this fudge factor out now, it seems fine without it.
+// *h -= 2;
}
// The button size is bigger than the bitmap size
-wxSize wxToolBar95::GetToolSize(void) const
+wxSize wxToolBar95::GetToolSize() const
{
return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
}
}
}
-void wxToolBar95::ClearTools(void)
+bool wxToolBar95::GetToolState(int toolIndex) const
+{
+ return (::SendMessage((HWND) GetHWND(), TB_ISBUTTONCHECKED, (WPARAM)toolIndex, (LPARAM)0) != 0);
+}
+
+void wxToolBar95::ClearTools()
{
// TODO: Don't know how to reset the toolbar bitmap, as yet.
// But adding tools and calling CreateTools should probably
wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
{
- wxToolBarTool *tool = new wxToolBarTool(index, bitmap, (wxBitmap *)NULL, toggle, xPos, yPos, helpString1, helpString2);
+ wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);
tool->m_clientData = clientData;
if (xPos > -1)
else
tool->m_y = m_yMargin;
- tool->SetSize(GetDefaultButtonWidth(), GetDefaultButtonHeight());
+ tool->SetSize(GetToolSize().x, GetToolSize().y);
m_tools.Append((long)index, tool);
return tool;
void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
{
m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
- m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
+ GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
// Remap the buttons
CreateTools();
wxWindow::OnSysColourChanged(event);
}
+void wxToolBar95::OnMouseEvent(wxMouseEvent& event)
+{
+ 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
+ {
+ Default();
+ }
+}
+
// These are the default colors used to map the bitmap colors
// to the current system colors
projects / wxWidgets.git / blobdiff