#endif
#ifndef WX_PRECOMP
- #include <wx/wx.h>
+ #include "wx/wx.h"
#endif
-#include <wx/toolbar.h>
-#include <wx/log.h>
-#include <wx/image.h>
+#include "wx/toolbar.h"
+#include "wx/log.h"
+#include "wx/image.h"
// define this to 1 to use wxToolBarSimple instead of the native one
#define USE_GENERIC_TBAR 0
#error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
to 1 in setup.h and recompile the library.
#else
- #include <wx/tbarsmpl.h>
+ #include "wx/tbarsmpl.h"
#endif
#endif // USE_GENERIC_TBAR
// resources
// ----------------------------------------------------------------------------
-#if USE_XPM_BITMAPS
+#if !defined(__WXMSW__) && !defined(__WXPM__)
#include "mondrian.xpm"
+#endif
+
+#if USE_XPM_BITMAPS
#include "bitmaps/new.xpm"
#include "bitmaps/open.xpm"
#include "bitmaps/save.xpm"
{
public:
MyFrame(wxFrame *parent,
- wxWindowID id = -1,
+ wxWindowID id = wxID_ANY,
const wxString& title = _T("wxToolBar Sample"),
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
void OnToggleToolbarSize(wxCommandEvent& event);
void OnToggleToolbarOrient(wxCommandEvent& event);
void OnToggleToolbarRows(wxCommandEvent& event);
+ void OnToggleCustomDisabled(wxCommandEvent& event);
void OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); }
void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); }
void OnToolbarStyle(wxCommandEvent& event);
void OnToolLeftClick(wxCommandEvent& event);
+ void OnToolRightClick(wxCommandEvent& event);
void OnToolEnter(wxCommandEvent& event);
void OnCombo(wxCommandEvent& event);
bool m_smallToolbar,
m_horzToolbar,
- m_horzText;
+ m_horzText,
+ m_useCustomDisabled;
size_t m_rows; // 1 or 2 only
// the number of print buttons we have (they're added/removed dynamically)
IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
IDM_TOOLBAR_TOGGLETOOLBARORIENT,
IDM_TOOLBAR_TOGGLETOOLBARROWS,
+ IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
IDM_TOOLBAR_ENABLEPRINT,
IDM_TOOLBAR_DELETEPRINT,
IDM_TOOLBAR_INSERTPRINT,
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize)
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARORIENT, MyFrame::OnToggleToolbarOrient)
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARROWS, MyFrame::OnToggleToolbarRows)
+ EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)
EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, MyFrame::OnEnablePrint)
EVT_MENU(IDM_TOOLBAR_DELETEPRINT, MyFrame::OnDeletePrint)
EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
MyFrame::OnToolbarStyle)
- EVT_MENU(-1, MyFrame::OnToolLeftClick)
+ EVT_MENU(wxID_ANY, MyFrame::OnToolLeftClick)
EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)
EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
+ EVT_TOOL_RCLICKED(wxID_ANY, MyFrame::OnToolRightClick)
EVT_UPDATE_UI(wxID_COPY, MyFrame::OnUpdateCopyAndCut)
EVT_UPDATE_UI(wxID_CUT, MyFrame::OnUpdateCopyAndCut)
bool MyApp::OnInit()
{
// Create the main frame window
- MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
+ MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
_T("wxToolBar Sample"),
#ifdef __WXWINCE__
- wxPoint(0, 0), wxDefaultSize, wxNO_BORDER
+ wxDefaultPosition, wxDefaultSize
#else
wxPoint(100, 100), wxSize(550, 300)
#endif
);
- frame->Show(TRUE);
+ frame->Show(true);
- frame->SetStatusText(_T("Hello, wxWindows"));
+#if wxUSE_STATUSBAR
+ frame->SetStatusText(_T("Hello, wxWidgets"));
+#endif
SetTopWindow(frame);
- return TRUE;
+ return true;
}
void MyFrame::RecreateToolbar()
#ifdef __WXWINCE__
// On Windows CE, we should not delete the
// previous toolbar in case it contains the menubar.
- // We'll try to accomodate this usage in due course.
+ // We'll try to accommodate this usage in due course.
wxToolBar* toolBar = CreateToolBar();
#else
// delete and recreate the toolbar
#endif
// Set up toolbar
- wxBitmap toolBarBitmaps[8];
+ enum
+ {
+ Tool_new,
+ Tool_open,
+ Tool_save,
+ Tool_copy,
+ Tool_cut,
+ Tool_paste,
+ Tool_print,
+ Tool_help,
+ Tool_Max
+ };
+
+ wxBitmap toolBarBitmaps[Tool_Max];
#if USE_XPM_BITMAPS
- toolBarBitmaps[0] = wxBitmap(new_xpm);
- toolBarBitmaps[1] = wxBitmap(open_xpm);
- toolBarBitmaps[2] = wxBitmap(save_xpm);
- toolBarBitmaps[3] = wxBitmap(copy_xpm);
- toolBarBitmaps[4] = wxBitmap(cut_xpm);
- toolBarBitmaps[5] = wxBitmap(paste_xpm);
- toolBarBitmaps[6] = wxBitmap(print_xpm);
- toolBarBitmaps[7] = wxBitmap(help_xpm);
+ #define INIT_TOOL_BMP(bmp) \
+ toolBarBitmaps[Tool_##bmp] = wxBitmap(bmp##_xpm)
#else // !USE_XPM_BITMAPS
- toolBarBitmaps[0] = wxBITMAP(new);
- toolBarBitmaps[1] = wxBITMAP(open);
- toolBarBitmaps[2] = wxBITMAP(save);
- toolBarBitmaps[3] = wxBITMAP(copy);
- toolBarBitmaps[4] = wxBITMAP(cut);
- toolBarBitmaps[5] = wxBITMAP(paste);
- toolBarBitmaps[6] = wxBITMAP(print);
- toolBarBitmaps[7] = wxBITMAP(help);
+ #define INIT_TOOL_BMP(bmp) \
+ toolBarBitmaps[Tool_##bmp] = wxBITMAP(bmp)
#endif // USE_XPM_BITMAPS/!USE_XPM_BITMAPS
+ INIT_TOOL_BMP(new);
+ INIT_TOOL_BMP(open);
+ INIT_TOOL_BMP(save);
+ INIT_TOOL_BMP(copy);
+ INIT_TOOL_BMP(cut);
+ INIT_TOOL_BMP(paste);
+ INIT_TOOL_BMP(print);
+ INIT_TOOL_BMP(help);
+
+ int w = toolBarBitmaps[Tool_new].GetWidth(),
+ h = toolBarBitmaps[Tool_new].GetHeight();
+
if ( !m_smallToolbar )
{
- int w = 2*toolBarBitmaps[0].GetWidth(),
- h = 2*toolBarBitmaps[0].GetHeight();
- for ( size_t n = 0; n < WXSIZEOF(toolBarBitmaps); n++ )
+ w *= 2;
+ h *= 2;
+
+ for ( size_t n = Tool_new; n < WXSIZEOF(toolBarBitmaps); n++ )
{
toolBarBitmaps[n] =
wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
toolBar->SetToolBitmapSize(wxSize(w, h));
}
- toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[0], _T("New file"));
- toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[1], _T("Open file"));
+ toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[Tool_new], _T("New file"));
+ toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
// the generic toolbar doesn't really support this
#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
// adding a combo to a vertical toolbar is not very smart
if ( m_horzToolbar )
{
- wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,-1) );
+ wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(200,wxDefaultCoord) );
combo->Append(_T("This"));
combo->Append(_T("is a"));
combo->Append(_T("combobox"));
}
#endif // toolbars which don't support controls
- toolBar->AddTool(wxID_SAVE, _T("Save"), toolBarBitmaps[2], _T("Toggle button 1"), wxITEM_CHECK);
- toolBar->AddTool(wxID_COPY, _T("Copy"), toolBarBitmaps[3], _T("Toggle button 2"), wxITEM_CHECK);
- toolBar->AddTool(wxID_CUT, _T("Cut"), toolBarBitmaps[4], _T("Toggle/Untoggle help button"));
- toolBar->AddTool(wxID_PASTE, _T("Paste"), toolBarBitmaps[5], _T("Paste"));
- toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[6], _T("Delete this tool. This is a very long tooltip to test whether it does the right thing when the tooltip is more than Windows can cope with."));
+ toolBar->AddTool(wxID_SAVE, _T("Save"), toolBarBitmaps[Tool_save], _T("Toggle button 1"), wxITEM_CHECK);
+ toolBar->AddTool(wxID_COPY, _T("Copy"), toolBarBitmaps[Tool_copy], _T("Toggle button 2"), wxITEM_CHECK);
+ toolBar->AddTool(wxID_CUT, _T("Cut"), toolBarBitmaps[Tool_cut], _T("Toggle/Untoggle help button"));
+ toolBar->AddTool(wxID_PASTE, _T("Paste"), toolBarBitmaps[Tool_paste], _T("Paste"));
+
+ if ( m_useCustomDisabled )
+ {
+ wxBitmap bmpDisabled(w, h);
+ {
+ wxMemoryDC dc;
+ dc.SelectObject(bmpDisabled);
+ dc.DrawBitmap(toolBarBitmaps[Tool_print], 0, 0);
+
+ wxPen pen(*wxRED, 5);
+ dc.SetPen(pen);
+ dc.DrawLine(0, 0, w, h);
+ }
+
+ toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[Tool_print],
+ bmpDisabled);
+ }
+ else
+ {
+ toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[Tool_print],
+ _T("Delete this tool. This is a very long tooltip to test whether it does the right thing when the tooltip is more than Windows can cope with."));
+ }
+
toolBar->AddSeparator();
- toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[7], _T("Help button"), wxITEM_CHECK);
+ toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[Tool_help], _T("Help button"), wxITEM_CHECK);
// after adding the buttons to the toolbar, must call Realize() to reflect
// the changes
: wxFrame(parent, id, title, pos, size, style)
{
m_tbar = NULL;
- m_textWindow = new wxTextCtrl(this, -1, _T(""), wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
- m_smallToolbar = TRUE;
- m_horzToolbar = TRUE;
- m_horzText = FALSE;
+ m_smallToolbar = true;
+ m_horzToolbar = true;
+ m_horzText = false;
+ m_useCustomDisabled = false;
m_rows = 1;
m_nPrint = 1;
-#ifndef __WXWINCE__
+#if wxUSE_STATUSBAR
// Give it a status line
CreateStatusBar();
#endif
_T("Toggle number of &rows\tCtrl-R"),
_T("Toggle number of toolbar rows between 1 and 2"));
+ tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
+ _T("Use c&ustom disabled images\tCtrl-U"),
+ _T("Switch between using system-generated and custom disabled images"));
+
+
tbarMenu->AppendSeparator();
- tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"), _T(""));
- tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"), _T(""));
- tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), _T(""));
- tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), _T(""));
+ tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"), wxEmptyString);
+ tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"), wxEmptyString);
+ tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), wxEmptyString);
+ tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), wxEmptyString);
tbarMenu->AppendSeparator();
- tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"), _T(""));
- tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"), _T(""));
- tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"), _T(""));
+ tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"), wxEmptyString);
+ tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"), wxEmptyString);
+ tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"), wxEmptyString);
tbarMenu->AppendSeparator();
- tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), _T(""));
+ tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), wxEmptyString);
tbarMenu->AppendSeparator();
tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, _T("Show &text\tAlt-T"));
tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, _T("Show &icons\tAlt-I"));
// Associate the menu bar with the frame
SetMenuBar(menuBar);
- menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, TRUE);
+ menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
// Create the toolbar
RecreateToolbar();
+
+ m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
}
#if USE_GENERIC_TBAR
int offset;
if ( m_tbar )
{
- m_tbar->SetSize(-1, size.y);
- m_tbar->Move(0, 0);
+ m_tbar->SetSize(0, 0, wxDefaultCoord, size.y);
offset = m_tbar->GetSize().x;
}
}
else
{
- long style = GetToolBar()->GetWindowStyle();
+ long style = GetToolBar() ? GetToolBar()->GetWindowStyle()
+ : TOOLBAR_STYLE;
style &= ~wxTB_HORIZONTAL;
style |= wxTB_VERTICAL;
- m_tbar = new wxToolBar(this, -1,
+ m_tbar = new wxToolBar(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
style);
//RecreateToolbar(); -- this is unneeded
}
+void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event))
+{
+ m_useCustomDisabled = !m_useCustomDisabled;
+
+ RecreateToolbar();
+}
+
void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))
{
m_horzToolbar = !m_horzToolbar;
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- Close(TRUE);
+ Close(true);
}
void MyFrame::OnAbout(wxCommandEvent& event)
else
m_textWindow->WriteText( _T("Help button up now.\n") );
- (void)wxMessageBox(_T("wxWindows toolbar sample"), _T("About wxToolBar"));
+ (void)wxMessageBox(_T("wxWidgets toolbar sample"), _T("About wxToolBar"));
}
void MyFrame::OnToolLeftClick(wxCommandEvent& event)
}
}
+void MyFrame::OnToolRightClick(wxCommandEvent& event)
+{
+ m_textWindow->AppendText(
+ wxString::Format(_T("Tool %d right clicked.\n"),
+ (int) event.GetInt()));
+}
+
void MyFrame::OnCombo(wxCommandEvent& event)
{
wxLogStatus(_T("Combobox string '%s' selected"), event.GetString().c_str());
void MyFrame::OnToolEnter(wxCommandEvent& event)
{
+#if wxUSE_STATUSBAR
if (event.GetSelection() > -1)
{
wxString str;
SetStatusText(str);
}
else
- SetStatusText(_T(""));
+ SetStatusText(wxEmptyString);
+#else
+ wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR
}
void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
}
}
-
projects / wxWidgets.git / blobdiff