// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
m_height = size.y;
}
- long GetWidth() const { return m_width; }
- long GetHeight() const { return m_height; }
+ wxCoord GetWidth() const { return m_width; }
+ wxCoord GetHeight() const { return m_height; }
wxCoord m_x;
wxCoord m_y;
// wxWin macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
+
+#if !wxUSE_TOOLBAR_NATIVE
+ #include "wx/toolbar.h"
+
+ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
+#endif
BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
- EVT_SIZE(wxToolBarSimple::OnSize)
+ EVT_SIZE(wxToolBarSimple::OnSize)
EVT_SCROLL(wxToolBarSimple::OnScroll)
- EVT_PAINT(wxToolBarSimple::OnPaint)
- EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
- EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
+ EVT_PAINT(wxToolBarSimple::OnPaint)
+ EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
+ EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
END_EVENT_TABLE()
// ============================================================================
m_defaultWidth = 16;
m_defaultHeight = 15;
+
+ m_xScrollPixelsPerLine = 1;
+ m_yScrollPixelsPerLine = 1;
+ m_xScrollingEnabled = FALSE;
+ m_yScrollingEnabled = FALSE;
+ m_xScrollPosition = 0;
+ m_yScrollPosition = 0;
+ m_xScrollLines = 0;
+ m_yScrollLines = 0;
+ m_xScrollLinesPerPage = 0;
+ m_yScrollLinesPerPage = 0;
}
wxToolBarToolBase *wxToolBarSimple::AddTool(int id,
helpString1, helpString2);
}
-bool wxToolBarSimple::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
+bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
+ wxToolBarToolBase *toolBase)
{
wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
if ( tool->IsButton() )
{
// Calculate reasonable max size in case Layout() not called
- if ((tool->m_x + tool->GetBitmap1().GetWidth() + m_xMargin) > m_maxWidth)
- m_maxWidth = (tool->m_x + tool->GetWidth() + m_xMargin);
+ if ((tool->m_x + tool->GetNormalBitmap().GetWidth() + m_xMargin) > m_maxWidth)
+ m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin));
- if ((tool->m_y + tool->GetBitmap1().GetHeight() + m_yMargin) > m_maxHeight)
- m_maxHeight = (tool->m_y + tool->GetHeight() + m_yMargin);
+ if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
+ m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
}
return TRUE;
return FALSE;
// Set it to grey (or other 3D face colour)
- wxSystemSettings settings;
- SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
m_lastX = m_xMargin;
m_lastY += maxToolHeight + m_toolPacking;
}
- tool->m_x = (long) (m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
- tool->m_y = (long) (m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
+ tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
+ tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
m_lastX += maxToolWidth + m_toolPacking;
}
m_lastX += (maxToolWidth + m_toolPacking);
m_lastY = m_yMargin;
}
- tool->m_x = (long) (m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
- tool->m_y = (long) (m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
+ tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
+ tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
m_lastY += maxToolHeight + m_toolPacking;
}
PrepareDC(dc);
wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
- wxPen white_pen("WHITE", 1, wxSOLID);
- wxPen black_pen("BLACK", 1, wxSOLID);
+ wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
+ wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
wxBitmap bitmap = tool->GetBitmap();
if ( bitmap.Ok() )
{
+#if wxUSE_PALETTE
#ifndef __WXGTK__
if (bitmap.GetPalette())
memDC.SetPalette(*bitmap.GetPalette());
#endif
+#endif // wxUSE_PALETTE
int ax = (int)tool->m_x,
ay = (int)tool->m_y,
&memDC, 0, 0);
}
memDC.SelectObject(wxNullBitmap);
+
+#if wxUSE_PALETTE
#ifndef __WXGTK__
- memDC.SetPalette(wxNullPalette);
+ if (bitmap.GetPalette())
+ memDC.SetPalette(wxNullPalette);
#endif
+#endif // wxUSE_PALETTE
}
// No second bitmap, so draw a thick line around bitmap, or invert if mono
else if ( tool->IsToggled() )
if (!drawBorder)
{
- memDC.SelectObject(tool->GetBitmap1());
+ memDC.SelectObject(tool->GetNormalBitmap());
dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(),
&memDC, 0, 0, wxSRC_INVERT);
memDC.SelectObject(wxNullBitmap);
}
else
{
- bitmap = tool->GetBitmap1();
+ bitmap = tool->GetNormalBitmap();
if (m_windowStyle & wxTB_3DBUTTONS)
{
}
else
{
- long x = tool->m_x;
- long y = tool->m_y;
- long w = bitmap.GetWidth();
- long h = bitmap.GetHeight();
- wxPen thick_black_pen("BLACK", 3, wxSOLID);
+ wxCoord x = tool->m_x;
+ wxCoord y = tool->m_y;
+ wxCoord w = bitmap.GetWidth();
+ wxCoord h = bitmap.GetHeight();
+ wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID);
memDC.SelectObject(bitmap);
dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);
if ( tool && tool->CanBeToggled() )
{
- tool->Toggle();
+ if (tool->IsToggled())
+ tool->Toggle();
DrawTool(tool);
}
int orient = event.GetOrientation();
int nScrollInc = 0;
- switch (event.GetEventType())
+ if (event.GetEventType() == wxEVT_SCROLL_TOP)
{
- case wxEVT_SCROLL_TOP:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = - m_xScrollPosition;
- else
- nScrollInc = - m_yScrollPosition;
- break;
- }
- case wxEVT_SCROLL_BOTTOM:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = m_xScrollLines - m_xScrollPosition;
- else
- nScrollInc = m_yScrollLines - m_yScrollPosition;
- break;
- }
- case wxEVT_SCROLL_LINEUP:
- {
- nScrollInc = -1;
- break;
- }
- case wxEVT_SCROLL_LINEDOWN:
- {
- nScrollInc = 1;
- break;
- }
- case wxEVT_SCROLL_PAGEUP:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = -GetScrollPageSize(wxVERTICAL);
- break;
- }
- case wxEVT_SCROLL_PAGEDOWN:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = GetScrollPageSize(wxVERTICAL);
- break;
- }
- case wxEVT_SCROLL_THUMBTRACK:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = pos - m_xScrollPosition;
- else
- nScrollInc = pos - m_yScrollPosition;
- break;
- }
- default:
- {
- break;
- }
+ if (orient == wxHORIZONTAL)
+ nScrollInc = - m_xScrollPosition;
+ else
+ nScrollInc = - m_yScrollPosition;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = m_xScrollLines - m_xScrollPosition;
+ else
+ nScrollInc = m_yScrollLines - m_yScrollPosition;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
+ {
+ nScrollInc = -1;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
+ {
+ nScrollInc = 1;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
+ else
+ nScrollInc = -GetScrollPageSize(wxVERTICAL);
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = GetScrollPageSize(wxHORIZONTAL);
+ else
+ nScrollInc = GetScrollPageSize(wxVERTICAL);
+ } else
+ if ((event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) ||
+ (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE))
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = pos - m_xScrollPosition;
+ else
+ nScrollInc = pos - m_yScrollPosition;
}
+
if (orient == wxHORIZONTAL)
{
int w, h;
projects / wxWidgets.git / blobdiff