drag-and-drop adding of controls to test window

[wxWidgets.git] / samples / toolbar / toolbar.cpp

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 0841abd4ad20ee6d0e25c6f4d27f5d998b1daf51..99bd1fe6657d83061a44eee2fabd9fb1db0aa765 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -32,6 +32,8 @@
 #include "wx/log.h"
 #include "wx/image.h"
 #include "wx/filedlg.h"
 #include "wx/log.h"
 #include "wx/image.h"
 #include "wx/filedlg.h"

+#include "wx/spinctrl.h"
+#include "wx/srchctrl.h"

 
 // 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
 
 // 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


@@ -64,6 +66,14 @@
     #include "bitmaps/help.xpm"
 #endif // USE_XPM_BITMAPS
 
     #include "bitmaps/help.xpm"
 #endif // USE_XPM_BITMAPS
 

+enum Positions
+{
+    TOOLBAR_LEFT,
+    TOOLBAR_TOP,
+    TOOLBAR_RIGHT,
+    TOOLBAR_BOTTOM
+};
+

 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------


@@ -97,9 +107,8 @@ public:
     void OnToggleAnotherToolbar(wxCommandEvent& event);
     void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event));
 
     void OnToggleAnotherToolbar(wxCommandEvent& event);
     void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event));
 

-    void OnBottomToolbar(wxCommandEvent& WXUNUSED(event));

     void OnToggleToolbarSize(wxCommandEvent& 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 OnToggleToolbarRows(wxCommandEvent& event);
     void OnToggleTooltips(wxCommandEvent& event);
     void OnToggleCustomDisabled(wxCommandEvent& event);


@@ -132,8 +141,6 @@ private:
     void LayoutChildren();
 
     bool                m_smallToolbar,
     void LayoutChildren();
 
     bool                m_smallToolbar,

-                        m_horzToolbar,
-                        m_bottomToolbar,

                         m_horzText,
                         m_useCustomDisabled,
                         m_showTooltips;
                         m_horzText,
                         m_useCustomDisabled,
                         m_showTooltips;


@@ -142,6 +149,9 @@ private:
     // the number of print buttons we have (they're added/removed dynamically)
     size_t              m_nPrint;
 
     // 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;
     wxTextCtrl         *m_textWindow;
 
     wxToolBar          *m_tbar;


@@ -163,7 +173,6 @@ static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;
 enum
 {
     IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
 enum
 {
     IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,

-    IDM_TOOLBAR_TOGGLETOOLBARORIENT,

     IDM_TOOLBAR_TOGGLETOOLBARROWS,
     IDM_TOOLBAR_TOGGLETOOLTIPS,
     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
     IDM_TOOLBAR_TOGGLETOOLBARROWS,
     IDM_TOOLBAR_TOGGLETOOLTIPS,
     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,


@@ -182,7 +191,10 @@ enum
     IDM_TOOLBAR_SHOW_ICONS,
     IDM_TOOLBAR_SHOW_BOTH,
     IDM_TOOLBAR_CUSTOM_PATH,
     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_BOTTOM_ORIENTATION,

+    IDM_TOOLBAR_RIGHT_ORIENTATION,

     IDM_TOOLBAR_OTHER_1,
     IDM_TOOLBAR_OTHER_2,
     IDM_TOOLBAR_OTHER_3,
     IDM_TOOLBAR_OTHER_1,
     IDM_TOOLBAR_OTHER_2,
     IDM_TOOLBAR_OTHER_3,


@@ -208,9 +220,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar)
     EVT_MENU(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnToggleHorizontalText)
 
     EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar)
     EVT_MENU(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnToggleHorizontalText)
 

-    EVT_MENU(IDM_TOOLBAR_BOTTOM_ORIENTATION, MyFrame::OnBottomToolbar)
+    EVT_MENU_RANGE(IDM_TOOLBAR_TOP_ORIENTATION, IDM_TOOLBAR_RIGHT_ORIENTATION, MyFrame::OnChangeOrientation)

     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize)
     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_MENU(IDM_TOOLBAR_TOGGLETOOLBARROWS, MyFrame::OnToggleToolbarRows)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLTIPS, MyFrame::OnToggleTooltips)
     EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)


@@ -258,6 +269,9 @@ IMPLEMENT_APP(MyApp)
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
                                  _T("wxToolBar Sample"),
     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
                                  _T("wxToolBar Sample"),


@@ -292,11 +306,22 @@ void MyFrame::RecreateToolbar()
 
     SetToolBar(NULL);
 
 
     SetToolBar(NULL);
 

-    style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_HORZ_LAYOUT);
-    if( m_bottomToolbar )
+    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;
         style |= wxTB_BOTTOM;

-    else
-    style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
+        break;
+    }

 
     if ( m_showTooltips )
         style &= ~wxTB_NO_TOOLTIPS;
 
     if ( m_showTooltips )
         style &= ~wxTB_NO_TOOLTIPS;


@@ -369,18 +394,24 @@ void MyFrame::RecreateToolbar()
     // the generic toolbar doesn't really support this
 #if wxUSE_TOOLBAR_NATIVE && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
     // adding a combo to a vertical toolbar is not very smart
     // the generic toolbar doesn't really support this
 #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) );
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(100,-1) );

         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
         combo->Append(_T("in a"));
         combo->Append(_T("toolbar"));
         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
         combo->Append(_T("in a"));
         combo->Append(_T("toolbar"));

-        toolBar->AddControl(combo);
+        toolBar->AddControl(combo, _T("Combo Label"));
+
+        wxSpinCtrl *spin = new wxSpinCtrl( toolBar, ID_SPIN, wxT("0"), wxDefaultPosition, wxSize(80,wxDefaultCoord), 0, 0, 100 );
+        toolBar->AddControl( spin );

 
 

-        //wxSpinCtrl *spin = new wxSpinCtrl( toolBar, ID_SPIN, wxT("0"), wxDefaultPosition, wxSize(80,wxDefaultCoord), 0, 100, 0 );
-        //toolBar->AddControl( spin );
+        wxTextCtrl *text = new wxTextCtrl( toolBar, -1, wxT("text"), wxDefaultPosition, wxSize(80,wxDefaultCoord) );
+        toolBar->AddControl( text );
+
+        wxSearchCtrl *srch = new wxSearchCtrl( toolBar, -1, wxT("xx"), wxDefaultPosition, wxSize(80,wxDefaultCoord), wxSUNKEN_BORDER );
+        toolBar->AddControl( srch );

     }
 #endif // toolbars which don't support controls
 
     }
 #endif // toolbars which don't support controls
 


@@ -432,7 +463,7 @@ void MyFrame::RecreateToolbar()
     // the changes
     toolBar->Realize();
 
     // the changes
     toolBar->Realize();
 

-    toolBar->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
+    toolBar->SetRows(!(toolBar->IsVertical()) ? m_rows : 10 / m_rows);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -451,8 +482,6 @@ MyFrame::MyFrame(wxFrame* parent,
     m_tbar = NULL;
 
     m_smallToolbar = true;
     m_tbar = NULL;
 
     m_smallToolbar = true;

-    m_horzToolbar = true;
-    m_bottomToolbar = false;

     m_horzText = false;
     m_useCustomDisabled = false;
     m_showTooltips = true;
     m_horzText = false;
     m_useCustomDisabled = false;
     m_showTooltips = true;


@@ -486,10 +515,6 @@ MyFrame::MyFrame(wxFrame* parent,
                               _T("&Toggle toolbar size\tCtrl-S"),
                               _T("Toggle between big/small toolbar"));
 
                               _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->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,
                               _T("Toggle number of &rows\tCtrl-R"),
                               _T("Toggle number of toolbar rows between 1 and 2"));


@@ -503,9 +528,19 @@ MyFrame::MyFrame(wxFrame* parent,
                               _T("Switch between using system-generated and custom disabled images"));
 
 
                               _T("Switch between using system-generated and custom disabled images"));
 
 

-    tbarMenu->AppendCheckItem(IDM_TOOLBAR_BOTTOM_ORIENTATION,
+    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"));
                               _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->AppendSeparator();
 
     tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"));


@@ -543,25 +578,14 @@ MyFrame::MyFrame(wxFrame* parent,
     menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
     menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, true);
 
     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, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
 }
 
     // Create the toolbar
     RecreateToolbar();
 
     m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
 }
 

-#if USE_GENERIC_TBAR
-
-wxToolBar* MyFrame::OnCreateToolBar(long style,
-                                    wxWindowID id,
-                                    const wxString& name)
-{
-    return (wxToolBar *)new wxToolBarSimple(this, id,
-                                            wxDefaultPosition, wxDefaultSize,
-                                            style, name);
-}
-
-#endif // USE_GENERIC_TBAR
-

 void MyFrame::LayoutChildren()
 {
     wxSize size = GetClientSize();
 void MyFrame::LayoutChildren()
 {
     wxSize size = GetClientSize();


@@ -660,7 +684,7 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event))
     // m_rows may be only 1 or 2
     m_rows = 3 - m_rows;
 
     // 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(); -- this is unneeded
 }


@@ -679,15 +703,23 @@ void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event))
     RecreateToolbar();
 }
 
     RecreateToolbar();
 }
 

-void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnChangeOrientation(wxCommandEvent& event)

 {
 {

-    if( m_bottomToolbar )
-        m_bottomToolbar = false;
-    m_horzToolbar = !m_horzToolbar;
-    wxMenuBar *menuBar = GetMenuBar();
-    if( menuBar->IsChecked( IDM_TOOLBAR_BOTTOM_ORIENTATION ) )
-        menuBar->Check( IDM_TOOLBAR_BOTTOM_ORIENTATION, false );
-
+    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();
 }
 
     RecreateToolbar();
 }
 


@@ -836,13 +868,3 @@ void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
                             event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
     }
 }
                             event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
     }
 }

-void MyFrame::OnBottomToolbar(wxCommandEvent& WXUNUSED(event) )
-{
-    m_bottomToolbar = !m_bottomToolbar;
-    wxMenuBar *menuBar = GetMenuBar();
-    if( menuBar->IsChecked( IDM_TOOLBAR_TOGGLETOOLBARORIENT ) )
-        menuBar->Check( IDM_TOOLBAR_TOGGLETOOLBARORIENT, false );
-    if( !m_horzToolbar )
-        m_horzToolbar = true;
-    RecreateToolbar();
-}