public:
wxToolBarToolSimple(wxToolBarSimple *tbar,
int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
- : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
+ : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp)
{
}
wxCoord GetWidth() const { return m_width; }
wxCoord GetHeight() const { return m_height; }
- wxCoord m_x;
- wxCoord m_y;
- wxCoord m_width;
- wxCoord m_height;
+ wxCoord m_x;
+ wxCoord m_y;
+ wxCoord m_width;
+ wxCoord m_height;
};
// ----------------------------------------------------------------------------
// 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)
// ----------------------------------------------------------------------------
wxToolBarToolBase *wxToolBarSimple::CreateTool(int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
{
- return new wxToolBarToolSimple(this, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString);
+ return new wxToolBarToolSimple(this, id, label, bmpNormal, bmpDisabled,
+ kind, clientData, shortHelp, longHelp);
}
wxToolBarToolBase *wxToolBarSimple::CreateTool(wxControl *control)
m_yScrollLinesPerPage = 0;
}
-wxToolBarToolBase *wxToolBarSimple::AddTool(int id,
- const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap,
- bool toggle,
- wxCoord xPos,
- wxCoord yPos,
- wxObject *clientData,
- const wxString& helpString1,
- const wxString& helpString2)
+wxToolBarToolBase *wxToolBarSimple::DoAddTool(int id,
+ const wxString& label,
+ const wxBitmap& bitmap,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ const wxString& shortHelp,
+ const wxString& longHelp,
+ wxObject *clientData,
+ wxCoord xPos,
+ wxCoord yPos)
{
// rememeber the position for DoInsertTool()
m_xPos = xPos;
m_yPos = yPos;
- return wxToolBarBase::AddTool(id, bitmap, pushedBitmap, toggle,
- xPos, yPos, clientData,
- helpString1, helpString2);
+ return wxToolBarBase::DoAddTool(id, label, bitmap, bmpDisabled, kind,
+ shortHelp, longHelp,
+ clientData, xPos, yPos);
}
bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
if ( tool->IsButton() )
{
// Calculate reasonable max size in case Layout() not called
- if ((tool->m_x + tool->GetBitmap1().GetWidth() + m_xMargin) > m_maxWidth)
+ 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)
+ if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
}
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 )
{
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)
{
wxCoord y = tool->m_y;
wxCoord w = bitmap.GetWidth();
wxCoord h = bitmap.GetHeight();
- wxPen thick_black_pen("BLACK", 3, wxSOLID);
+ 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