#include "wx/image.h"
#include "wx/filedlg.h"
-// define this to 1 to use wxToolBarSimple instead of the native one
-#define USE_GENERIC_TBAR 0
-
// define this to use XPMs everywhere (by default, BMPs are used under Win)
// BMPs use less space, but aren't compiled into the executable on other platforms
#ifdef __WXMSW__
#define USE_XPM_BITMAPS 1
#endif
-#if USE_GENERIC_TBAR
- #if !wxUSE_TOOLBAR_SIMPLE
- #error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
- to 1 in setup.h and recompile the library.
- #else
- #include "wx/tbarsmpl.h"
- #endif
-#endif // USE_GENERIC_TBAR
-
#if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
#error You need to enable XPM support to use XPM bitmaps with toolbar!
#endif // USE_XPM_BITMAPS
#include "bitmaps/help.xpm"
#endif // USE_XPM_BITMAPS
+enum Positions
+{
+ TOOLBAR_LEFT,
+ TOOLBAR_TOP,
+ TOOLBAR_RIGHT,
+ TOOLBAR_BOTTOM
+};
+
// ----------------------------------------------------------------------------
// classes
// ----------------------------------------------------------------------------
void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event));
void OnToggleToolbarSize(wxCommandEvent& event);
- void OnToggleToolbarOrient(wxCommandEvent& event);
+ void OnChangeOrientation(wxCommandEvent& event);
void OnToggleToolbarRows(wxCommandEvent& event);
void OnToggleTooltips(wxCommandEvent& event);
void OnToggleCustomDisabled(wxCommandEvent& event);
void OnToolLeftClick(wxCommandEvent& event);
void OnToolRightClick(wxCommandEvent& event);
- void OnToolEnter(wxCommandEvent& event);
void OnCombo(wxCommandEvent& event);
void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event)
{ event.Enable( m_tbar != NULL ); }
-#if USE_GENERIC_TBAR
- virtual wxToolBar *OnCreateToolBar(long style,
- wxWindowID id,
- const wxString& name );
-#endif // USE_GENERIC_TBAR
-
private:
void DoEnablePrint();
void DoDeletePrint();
void LayoutChildren();
bool m_smallToolbar,
- m_horzToolbar,
m_horzText,
m_useCustomDisabled,
m_showTooltips;
// the number of print buttons we have (they're added/removed dynamically)
size_t m_nPrint;
+ // store toolbar position for future use
+ Positions m_toolbarPosition;
+
wxTextCtrl *m_textWindow;
wxToolBar *m_tbar;
enum
{
IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
- IDM_TOOLBAR_TOGGLETOOLBARORIENT,
IDM_TOOLBAR_TOGGLETOOLBARROWS,
IDM_TOOLBAR_TOGGLETOOLTIPS,
IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
IDM_TOOLBAR_SHOW_ICONS,
IDM_TOOLBAR_SHOW_BOTH,
IDM_TOOLBAR_CUSTOM_PATH,
-
+ IDM_TOOLBAR_TOP_ORIENTATION,
+ IDM_TOOLBAR_LEFT_ORIENTATION,
+ IDM_TOOLBAR_BOTTOM_ORIENTATION,
+ IDM_TOOLBAR_RIGHT_ORIENTATION,
IDM_TOOLBAR_OTHER_1,
IDM_TOOLBAR_OTHER_2,
IDM_TOOLBAR_OTHER_3,
- ID_COMBO = 1000
+ ID_COMBO = 1000,
+ ID_SPIN = 1001
};
// ----------------------------------------------------------------------------
EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar)
EVT_MENU(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnToggleHorizontalText)
+ EVT_MENU_RANGE(IDM_TOOLBAR_TOP_ORIENTATION, IDM_TOOLBAR_RIGHT_ORIENTATION, MyFrame::OnChangeOrientation)
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_TOGGLETOOLTIPS, MyFrame::OnToggleTooltips)
EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)
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)
SetToolBar(NULL);
- style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT);
- style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
+ style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT);
+ switch( m_toolbarPosition )
+ {
+ case TOOLBAR_LEFT:
+ style |= wxTB_LEFT;
+ break;
+ case TOOLBAR_TOP:
+ style |= wxTB_TOP;
+ break;
+ case TOOLBAR_RIGHT:
+ style |= wxTB_RIGHT;
+ break;
+ case TOOLBAR_BOTTOM:
+ style |= wxTB_BOTTOM;
+ break;
+ }
if ( m_showTooltips )
style &= ~wxTB_NO_TOOLTIPS;
toolBar->SetToolBitmapSize(wxSize(w, h));
- toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[Tool_new], _T("New file"));
- toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
+ toolBar->AddTool(wxID_NEW, _T("New"),
+ toolBarBitmaps[Tool_new], wxNullBitmap, wxITEM_NORMAL,
+ _T("New file"), _T("This is help for new file tool"));
+ toolBar->AddTool(wxID_OPEN, _T("Open"),
+ toolBarBitmaps[Tool_open], wxNullBitmap, wxITEM_NORMAL,
+ _T("Open file"), _T("This is help for open file tool"));
// the generic toolbar doesn't really support this
-#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
+#if wxUSE_TOOLBAR_NATIVE && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
// adding a combo to a vertical toolbar is not very smart
- if ( m_horzToolbar )
+ if ( !( toolBar->IsVertical() ) )
{
wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(200,wxDefaultCoord) );
combo->Append(_T("This"));
combo->Append(_T("in a"));
combo->Append(_T("toolbar"));
toolBar->AddControl(combo);
+
+ //wxSpinCtrl *spin = new wxSpinCtrl( toolBar, ID_SPIN, wxT("0"), wxDefaultPosition, wxSize(80,wxDefaultCoord), 0, 100, 0 );
+ //toolBar->AddControl( spin );
}
#endif // toolbars which don't support controls
// the changes
toolBar->Realize();
- toolBar->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
+ toolBar->SetRows(!(toolBar->IsVertical()) ? m_rows : 10 / m_rows);
}
// ----------------------------------------------------------------------------
m_tbar = NULL;
m_smallToolbar = true;
- m_horzToolbar = true;
m_horzText = false;
m_useCustomDisabled = false;
m_showTooltips = true;
_T("&Toggle toolbar size\tCtrl-S"),
_T("Toggle between big/small toolbar"));
- tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARORIENT,
- _T("Toggle toolbar &orientation\tCtrl-O"),
- _T("Toggle toolbar orientation"));
-
tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,
_T("Toggle number of &rows\tCtrl-R"),
_T("Toggle number of toolbar rows between 1 and 2"));
tbarMenu->AppendSeparator();
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_TOP_ORIENTATION,
+ _T("Set toolbar at the top of the window"),
+ _T("Set toolbar at the top of the window"));
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_LEFT_ORIENTATION,
+ _T("Set toolbar at the left of the window"),
+ _T("Set toolbar at the left of the window"));
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_BOTTOM_ORIENTATION,
+ _T("Set toolbar at the bottom of the window"),
+ _T("Set toolbar at the bottom of the window"));
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_RIGHT_ORIENTATION,
+ _T("Set toolbar at the right edge of the window"),
+ _T("Set toolbar at the right edge of the window"));
+ tbarMenu->AppendSeparator();
tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"));
tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"));
menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, true);
+ menuBar->Check(IDM_TOOLBAR_TOP_ORIENTATION, true );
+ m_toolbarPosition = TOOLBAR_TOP;
// Create the toolbar
RecreateToolbar();
- m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
+ m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
}
#if USE_GENERIC_TBAR
// m_rows may be only 1 or 2
m_rows = 3 - m_rows;
- GetToolBar()->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
+ GetToolBar()->SetRows(!(GetToolBar()->IsVertical()) ? m_rows : 10 / m_rows);
//RecreateToolbar(); -- this is unneeded
}
RecreateToolbar();
}
-void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnChangeOrientation(wxCommandEvent& event)
{
- m_horzToolbar = !m_horzToolbar;
-
+ switch( event.GetId() )
+ {
+ case IDM_TOOLBAR_LEFT_ORIENTATION:
+ m_toolbarPosition = TOOLBAR_LEFT;
+ break;
+ case IDM_TOOLBAR_TOP_ORIENTATION:
+ m_toolbarPosition = TOOLBAR_TOP;
+ break;
+ case IDM_TOOLBAR_RIGHT_ORIENTATION:
+ m_toolbarPosition = TOOLBAR_RIGHT;
+ break;
+ case IDM_TOOLBAR_BOTTOM_ORIENTATION:
+ m_toolbarPosition = TOOLBAR_BOTTOM;
+ break;
+ }
RecreateToolbar();
}
tb->Realize();
}
-void MyFrame::OnToolEnter(wxCommandEvent& event)
-{
-#if wxUSE_STATUSBAR
- if (event.GetSelection() > -1)
- {
- wxString str;
- str.Printf(_T("This is tool number %d"), event.GetSelection());
- SetStatusText(str);
- }
- else
- SetStatusText(wxEmptyString);
-#else
- wxUnusedVar(event);
-#endif // wxUSE_STATUSBAR
-}
-
void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
{
if ( m_tbar )
projects / wxWidgets.git / blobdiff