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

toolbar tooltips fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-11-28 22:42:05 +00:00
parent 5e9f40263d
commit 89b892a298
3 changed files with 144 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/string.cpp
View File

@@ -84,6 +84,31 @@ static const struct
// empty C style string: points to 'string data' byte of g_strEmpty
extern const char *g_szNul = &g_strEmpty.dummy;
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
// we want to find out if the current platform supports vsnprintf()-like
// function: for Unix this is done with configure, for Windows we test the
// compiler explicitly.
#ifdef __WXMSW__
#ifdef _MSC_VER
#define wxVsprintf _vsnprintf
#endif
#else // !Windows
#ifdef HAVE_VSNPRINTF
#define wxVsprintf vsnprintf
#endif
#endif // Windows/!Windows
#ifndef wxVsprintf
// in this case we'll use vsprintf() (which is ANSI and thus should be
// always available), but it's unsafe because it doesn't check for buffer
// size - so give a warning
#define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
#pragma message("Using sprintf() because no snprintf()-like function defined")
#endif
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
@@ -947,9 +972,11 @@ int wxString::PrintfV(const char* pszFormat, va_list argptr)
// static buffer to avoid dynamic memory allocation each time
static char s_szScratch[1024];
// NB: wxVsprintf() may return either less than the buffer size or -1 if there
// is not enough place depending on implementation
int iLen = wxVsprintf(s_szScratch, WXSIZEOF(s_szScratch), pszFormat, argptr);
char *buffer;
if ( (size_t)iLen < WXSIZEOF(s_szScratch) ) {
if ( iLen < (int)WXSIZEOF(s_szScratch) ) {
buffer = s_szScratch;
}
else {

1
src/msw/data.cpp
View File

@@ -154,6 +154,7 @@ const char *wxUserResourceStr = "TEXT";
#endif
#if wxUSE_POSTSCRIPT
class wxPrintPaperDatabase;
wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
#endif

126
src/msw/tbar95.cpp
View File

@@ -72,19 +72,21 @@ NM_CUSTOMDRAW message and do your custom drawing.
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
#endif
BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
#if 0 // it seems like none of these functions does anything anyhow
EVT_SIZE(wxToolBar95::OnSize)
EVT_PAINT(wxToolBar95::OnPaint)
EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
#endif // 0
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;
@@ -93,15 +95,22 @@ wxToolBar95::wxToolBar95(void)
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 ;
if (style & wxTB_VERTICAL)
wxMessageBox("Sorry, wxToolBar95 under Windows 95 only supports horizontal orientation.", "wxToolBar95 usage", wxOK);
wxASSERT_MSG( (style & wxTB_VERTICAL) == 0,
"Sorry, wxToolBar95 under Windows 95 only "
"supports horizontal orientation." );
m_maxWidth = -1;
m_maxHeight = -1;
@@ -111,22 +120,16 @@ bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, co
m_defaultHeight = DEFAULTBITMAPY;
SetName(name);
m_windowStyle = style;
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
SetParent(parent);
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;
if (width <= 0)
width = 100;
if (height <= 0)
@@ -137,37 +140,47 @@ bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, co
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;
}
// Create the toolbar control.
HWND hWndToolbar = CreateWindowEx(0L, // No extended styles.
HWND hWndToolbar = CreateWindowEx
(
0L, // No extended styles.
TOOLBARCLASSNAME, // Class name for the toolbar.
"", // No default text.
msStyle, // Styles and defaults.
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.
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);
if (parent)
parent->AddChild(this);
SubclassWin((WXHWND)hWndToolbar);
return TRUE;
}
wxToolBar95::~wxToolBar95(void)
wxToolBar95::~wxToolBar95()
{
UnsubclassWin();
@@ -178,7 +191,7 @@ wxToolBar95::~wxToolBar95(void)
}
}
bool wxToolBar95::CreateTools(void)
bool wxToolBar95::CreateTools()
{
if (m_tools.Number() == 0)
return FALSE;
@@ -296,13 +309,13 @@ bool wxToolBar95::CreateTools(void)
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;
}
@@ -331,7 +344,10 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
{
// First check if this applies to us
NMHDR *hdr = (NMHDR *)lParam;
if (hdr->code != TTN_NEEDTEXT)
// 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;
HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
@@ -346,28 +362,40 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
switch (ttText->hdr.code)
{
case TTN_NEEDTEXT:
{
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();
size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi);
wchar_t *pwz = new wchar_t[lenUnicode + 1];
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
}
// For backward compatibility...
OnMouseEnter(tool->m_index);
break;
}
default:
return FALSE;
break;
}
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));
}
@@ -379,7 +407,7 @@ void wxToolBar95::SetRows(int nRows)
m_maxHeight = (rect.bottom - rect.top + 2);
}
wxSize wxToolBar95::GetMaxSize(void) const
wxSize wxToolBar95::GetMaxSize() const
{
if ((m_maxWidth == -1) || (m_maxHeight == -1))
{
@@ -400,7 +428,7 @@ void wxToolBar95::GetSize(int *w, int *h) const
}
// 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);
}
@@ -435,7 +463,7 @@ bool wxToolBar95::GetToolState(int toolIndex) const
return (::SendMessage((HWND) GetHWND(), TB_ISBUTTONCHECKED, (WPARAM)toolIndex, (LPARAM)0) != 0);
}
void wxToolBar95::ClearTools(void)
void wxToolBar95::ClearTools()
{
// TODO: Don't know how to reset the toolbar bitmap, as yet.
// But adding tools and calling CreateTools should probably